nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-28 17:52:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push log source description out of libutil and report build hook @nix warning correctly

Browse Source
This commit is contained in:
Robert Hensing 2024-11-21 16:03:21 +01:00
parent 146953502b
commit 8179d9da38
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstore/build/derivation-goal.cc
View File

@ -1161,7 +1161,7 @@ HookReply DerivationGoal::tryBuildHook()
throw; throw;
} }
}(); }();
if (handleJSONLogMessage(s, worker.act, worker.hook->activities, true)) if (handleJSONLogMessage(s, worker.act, worker.hook->activities, "the build hook", true))
; ;
else if (s.substr(0, 2) == "# ") { else if (s.substr(0, 2) == "# ") {
reply = s.substr(2); reply = s.substr(2);
@ -1346,9 +1346,9 @@ void DerivationGoal::handleChildOutput(Descriptor fd, std::string_view data)
if (hook && fd == hook->fromHook.readSide.get()) { if (hook && fd == hook->fromHook.readSide.get()) {
for (auto c : data) for (auto c : data)
if (c == '\n') { if (c == '\n') {
auto json = parseJSONMessage(currentHookLine); auto json = parseJSONMessage(currentHookLine, "the derivation builder");
if (json) { if (json) {
auto s = handleJSONLogMessage(*json, worker.act, hook->activities, true); auto s = handleJSONLogMessage(*json, worker.act, hook->activities, "the derivation builder", true);
// ensure that logs from a builder using `ssh-ng://` as protocol // ensure that logs from a builder using `ssh-ng://` as protocol
// are also available to `nix log`. // are also available to `nix log`.
if (s && !isWrittenToLog && logSink) { if (s && !isWrittenToLog && logSink) {
@ -1390,7 +1390,7 @@ void DerivationGoal::handleEOF(Descriptor fd)
void DerivationGoal::flushLine() void DerivationGoal::flushLine()
{ {
if (handleJSONLogMessage(currentLogLine, *act, builderActivities, false)) if (handleJSONLogMessage(currentLogLine, *act, builderActivities, "the derivation builder", false))
; ;
else { else {

17
src/libutil/logging.cc
View File

@ -280,20 +280,22 @@ static Logger::Fields getFields(nlohmann::json & json)
return fields; return fields;
} }
std::optional<nlohmann::json> parseJSONMessage(const std::string & msg) std::optional<nlohmann::json> parseJSONMessage(const std::string & msg, std::string_view source)
{ {
if (!hasPrefix(msg, "@nix ")) return std::nullopt; if (!hasPrefix(msg, "@nix ")) return std::nullopt;
try { try {
return nlohmann::json::parse(std::string(msg, 5)); return nlohmann::json::parse(std::string(msg, 5));
} catch (std::exception & e) { } catch (std::exception & e) {
printError("bad JSON log message from builder: %s", e.what()); printError("bad JSON log message from %s: %s",
Uncolored(source),
e.what());
} }
return std::nullopt; return std::nullopt;
} }
bool handleJSONLogMessage(nlohmann::json & json, bool handleJSONLogMessage(nlohmann::json & json,
const Activity & act, std::map<ActivityId, Activity> & activities, const Activity & act, std::map<ActivityId, Activity> & activities,
bool trusted) std::string_view source, bool trusted)
{ {
try { try {
std::string action = json["action"]; std::string action = json["action"];
@ -329,7 +331,8 @@ bool handleJSONLogMessage(nlohmann::json & json,
return true; return true;
} catch (nlohmann::json::exception &e) { } catch (nlohmann::json::exception &e) {
warn( warn(
"warning: Unable to handle a JSON message from the builder: %s", "warning: Unable to handle a JSON message from %s: %s",
Uncolored(source),
e.what() e.what()
); );
return false; return false;
@ -337,12 +340,12 @@ bool handleJSONLogMessage(nlohmann::json & json,
} }
bool handleJSONLogMessage(const std::string & msg, bool handleJSONLogMessage(const std::string & msg,
const Activity & act, std::map<ActivityId, Activity> & activities, bool trusted) const Activity & act, std::map<ActivityId, Activity> & activities, std::string_view source, bool trusted)
{ {
auto json = parseJSONMessage(msg); auto json = parseJSONMessage(msg, source);
if (!json) return false; if (!json) return false;
return handleJSONLogMessage(*json, act, activities, trusted); return handleJSONLogMessage(*json, act, activities, source, trusted);
} }
Activity::~Activity() Activity::~Activity()

13
src/libutil/logging.hh
View File

@ -185,14 +185,25 @@ Logger * makeSimpleLogger(bool printBuildLogs = true);
Logger * makeJSONLogger(Logger & prevLogger); Logger * makeJSONLogger(Logger & prevLogger);
std::optional<nlohmann::json> parseJSONMessage(const std::string & msg); /**
* @param source A noun phrase describing the source of the message, e.g. "the builder".
*/
std::optional<nlohmann::json> parseJSONMessage(const std::string & msg, std::string_view source);
/**
* @param source A noun phrase describing the source of the message, e.g. "the builder".
*/
bool handleJSONLogMessage(nlohmann::json & json, bool handleJSONLogMessage(nlohmann::json & json,
const Activity & act, std::map<ActivityId, Activity> & activities, const Activity & act, std::map<ActivityId, Activity> & activities,
std::string_view source,
bool trusted); bool trusted);
/**
* @param source A noun phrase describing the source of the message, e.g. "the builder".
*/
bool handleJSONLogMessage(const std::string & msg, bool handleJSONLogMessage(const std::string & msg,
const Activity & act, std::map<ActivityId, Activity> & activities, const Activity & act, std::map<ActivityId, Activity> & activities,
std::string_view source,
bool trusted); bool trusted);
/** /**