From 2646e57aae5aedc3d07d8596aa6a61048b312e54 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 1 Aug 2020 15:44:48 -0400 Subject: fix(3p/nix): Prepend unix:// to daemon socket Prepend the unix:// URI scheme to the daemon socket so that grpc knows we want to connect to a unix socket rather than another type of URI. As part of debugging this I made the failure message for the RPCStore include the URI, which I'm leaving in since it'll be nice to have. Change-Id: I6e70596895117b9a0d53fe2a61d8542ceb64c940 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1543 Reviewed-by: kanepyork Tested-by: BuildkiteCI --- third_party/nix/src/libstore/rpc-store.hh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'third_party/nix/src/libstore/rpc-store.hh') diff --git a/third_party/nix/src/libstore/rpc-store.hh b/third_party/nix/src/libstore/rpc-store.hh index 332d1f4ba12b..0ef24e22b751 100644 --- a/third_party/nix/src/libstore/rpc-store.hh +++ b/third_party/nix/src/libstore/rpc-store.hh @@ -137,6 +137,8 @@ class RpcStore : public LocalFSStore, public virtual Store { private: std::optional uri_; std::unique_ptr stub_; + + void const SuccessOrThrow(const grpc::Status& status) const; }; } // namespace nix::store -- cgit 1.4.1