cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge "libstore/ssh: only resume the logger when we paused it" into main

Browse source
This commit is contained in:
alois31 2024-08-02 16:59:44 +00:00 committed by Gerrit Code Review
commit 32ca194ebf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/ssh.cc
View file

@ -65,10 +65,11 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
ProcessOptions options; ProcessOptions options;
options.dieWithParent = false; options.dieWithParent = false;
std::optional<Finally<std::function<void()>>> resumeLoggerDefer;
if (!fakeSSH && !useMaster) { if (!fakeSSH && !useMaster) {
logger->pause(); logger->pause();
resumeLoggerDefer.emplace([&]() { logger->resume(); });
} }
Finally cleanup = [&]() { logger->resume(); };
conn->sshPid = startProcess([&]() { conn->sshPid = startProcess([&]() {
restoreProcessContext(); restoreProcessContext();