max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ssh): extraneous master processes

Browse source
This commit is contained in:
ThinkChaos 2023-11-04 12:08:00 -04:00
parent 28dddde0ac
commit 6472c3bf0d
No known key found for this signature in database
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/ssh.cc
View file

@ -132,7 +132,6 @@ Path SSHMaster::startMaster()
if (state->sshMaster != -1) return state->socketPath; if (state->sshMaster != -1) return state->socketPath;
state->socketPath = (Path) *state->tmpDir + "/ssh.sock"; state->socketPath = (Path) *state->tmpDir + "/ssh.sock";
Pipe out; Pipe out;
@ -144,7 +143,8 @@ Path SSHMaster::startMaster()
logger->pause(); logger->pause();
Finally cleanup = [&]() { logger->resume(); }; Finally cleanup = [&]() { logger->resume(); };
bool wasMasterRunning = isMasterRunning(); if (isMasterRunning())
return state->socketPath;
state->sshMaster = startProcess([&]() { state->sshMaster = startProcess([&]() {
restoreProcessContext(); restoreProcessContext();
@ -165,14 +165,13 @@ Path SSHMaster::startMaster()
out.writeSide = -1; out.writeSide = -1;
if (!wasMasterRunning) { std::string reply;
std::string reply; try {
try { reply = readLine(out.readSide.get());
reply = readLine(out.readSide.get()); } catch (EndOfFile & e) { }
} catch (EndOfFile & e) { }
if (reply != "started") if (reply != "started") {
throw Error("failed to start SSH master connection to '%s'", host); throw Error("failed to start SSH master connection to '%s'", host);
} }
return state->socketPath; return state->socketPath;