chaostheorie/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

libstore/build: add a few explanatory comments; simplify

Browse source
This commit is contained in:
Maximilian Bosch 2022-02-20 16:02:44 +01:00
parent 287642f132
commit 102cb39086
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build/derivation-goal.cc
View file

@ -1177,6 +1177,7 @@ bool DerivationGoal::isReadDesc(int fd)
void DerivationGoal::handleChildOutput(int fd, std::string_view data) void DerivationGoal::handleChildOutput(int fd, std::string_view data)
{ {
// local & `ssh://`-builds are dealt with here.
auto isWrittenToLog = isReadDesc(fd); auto isWrittenToLog = isReadDesc(fd);
if (isWrittenToLog) if (isWrittenToLog)
{ {
@ -1210,13 +1211,13 @@ void DerivationGoal::handleChildOutput(int fd, std::string_view data)
auto json = parseJSONMessage(currentHookLine); auto json = parseJSONMessage(currentHookLine);
if (json) { if (json) {
auto s = handleJSONLogMessage(*json, worker.act, hook->activities, true); auto s = handleJSONLogMessage(*json, worker.act, hook->activities, true);
if (s && !isWrittenToLog && logSink) { // ensure that logs from a builder using `ssh-ng://` as protocol
if ((*json)["type"] == resBuildLogLine) { // are also available to `nix log`.
if (s && !isWrittenToLog && logSink && (*json)["type"] == resBuildLogLine) {
auto f = (*json)["fields"]; auto f = (*json)["fields"];
(*logSink)((f.size() > 0 ? f.at(0).get<std::string>() : "") + "\n"); (*logSink)((f.size() > 0 ? f.at(0).get<std::string>() : "") + "\n");
} }
} }
}
currentHookLine.clear(); currentHookLine.clear();
} else } else
currentHookLine += c; currentHookLine += c;