remote_store: register for NIX_REMOTE=unix://path #1801
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edolstra
reviewed
Jan 18, 2018
src/libstore/remote-store.hh
Outdated
| @@ -145,6 +146,7 @@ private: | |||
| }; | |||
|
|
|||
| ref<RemoteStore::Connection> openConnection() override; | |||
| std::experimental::optional<std::string> path = std::experimental::nullopt; | |||
There was a problem hiding this comment.
The initializer is unnecessary.
catern
force-pushed
the
master
branch
2 times, most recently
from
0cd8a95
to
722c643
Compare
shlevy
approved these changes
Jan 26, 2018
src/libstore/remote-store.cc
Outdated
| @@ -98,7 +111,12 @@ ref<RemoteStore::Connection> UDSRemoteStore::openConnection() | |||
| throw SysError("cannot create Unix domain socket"); | |||
| closeOnExec(conn->fd.get()); | |||
|
|
|||
| string socketPath = settings.nixDaemonSocketFile; | |||
| string socketPath; | |||
There was a problem hiding this comment.
Nit: socketPath = path ? *path : settings.nixDaemonSocketFile
This allows overriding the socket path so the daemon may be listening at an arbitrary Unix domain socket location. Fixes NixOS#1800
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows overriding the socket path so the daemon may be listening at
an arbitrary Unix domain socket location.
Fixes #1800