mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssh-store: Start master on-demand

Browse source
This commit is contained in:
Shea Levy 2016-09-12 08:07:50 -04:00
parent ab31f9986c
commit 196815f700
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libstore/ssh-store.cc
View file

@ -37,6 +37,8 @@ private:
Pid sshMaster; Pid sshMaster;
string uri; string uri;
Path key;
}; };
SSHStore::SSHStore(string uri, const Params & params, size_t maxConnections) SSHStore::SSHStore(string uri, const Params & params, size_t maxConnections)
@ -44,15 +46,8 @@ SSHStore::SSHStore(string uri, const Params & params, size_t maxConnections)
, RemoteStore(params, maxConnections) , RemoteStore(params, maxConnections)
, tmpDir(createTempDir("", "nix", true, true, 0700)) , tmpDir(createTempDir("", "nix", true, true, 0700))
, socketPath((Path) tmpDir + "/ssh.sock") , socketPath((Path) tmpDir + "/ssh.sock")
, sshMaster(startProcess([&]() {
auto key = get(params, "ssh-key", "");
if (key.empty())
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), uri.c_str(), NULL);
else
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), "-i", key.c_str(), uri.c_str(), NULL);
throw SysError("starting ssh master");
}))
, uri(std::move(uri)) , uri(std::move(uri))
, key(get(params, "ssh-key", ""))
{ {
} }
@ -92,6 +87,16 @@ ref<FSAccessor> SSHStore::getFSAccessor()
ref<RemoteStore::Connection> SSHStore::openConnection() ref<RemoteStore::Connection> SSHStore::openConnection()
{ {
if ((pid_t) sshMaster == -1) {
sshMaster = startProcess([&]() {
if (key.empty())
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), uri.c_str(), NULL);
else
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), "-i", key.c_str(), uri.c_str(), NULL);
throw SysError("starting ssh master");
});
}
auto conn = make_ref<Connection>(); auto conn = make_ref<Connection>();
Pipe in, out; Pipe in, out;
in.create(); in.create();