wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Factor out "last 10 log lines" error message code

Browse source 
This will help avoid duplication later. In particular, the next commit
will not need to duplicate as much.
This commit is contained in:
John Ericson 2025-03-12 17:07:34 -04:00
parent 0068e225e0
commit 1de97bbe2e
2 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -908,6 +908,33 @@ void runPostBuildHook(
});
}
void appendLogTailErrorMsg(
Worker & worker,
const StorePath & drvPath,
const std::list<std::string> & logTail,
std::string & msg)
{
if (!logger->isVerbose() && !logTail.empty()) {
msg += fmt(";\nlast %d log lines:\n", logTail.size());
for (auto & line : logTail) {
msg += "> ";
msg += line;
msg += "\n";
}
auto nixLogCommand = experimentalFeatureSettings.isEnabled(Xp::NixCommand)
? "nix log"
: "nix-store -l";
// The command is on a separate line for easy copying, such as with triple click.
// This message will be indented elsewhere, so removing the indentation before the
// command will not put it at the start of the line unfortunately.
msg += fmt("For full logs, run:\n " ANSI_BOLD "%s %s" ANSI_NORMAL,
nixLogCommand,
worker.store.printStorePath(drvPath));
}
}
Goal::Co DerivationGoal::buildDone()
{
trace("build done");
@ -959,23 +986,7 @@ Goal::Co DerivationGoal::buildDone()
Magenta(worker.store.printStorePath(drvPath)),
statusToString(status));
if (!logger->isVerbose() && !logTail.empty()) {
msg += fmt(";\nlast %d log lines:\n", logTail.size());
for (auto & line : logTail) {
msg += "> ";
msg += line;
msg += "\n";
}
auto nixLogCommand = experimentalFeatureSettings.isEnabled(Xp::NixCommand)
? "nix log"
: "nix-store -l";
// The command is on a separate line for easy copying, such as with triple click.
// This message will be indented elsewhere, so removing the indentation before the
// command will not put it at the start of the line unfortunately.
msg += fmt("For full logs, run:\n " ANSI_BOLD "%s %s" ANSI_NORMAL,
nixLogCommand,
worker.store.printStorePath(drvPath));
}
appendLogTailErrorMsg(worker, drvPath, logTail, msg);
if (diskFull)
msg += "\nnote: build failure may have been caused by lack of free disk space";

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

@ -55,6 +55,13 @@ struct InitialOutput {
std::optional<InitialOutputStatus> known;
};
/** Used internally */
void appendLogTailErrorMsg(
Worker & worker,
const StorePath & drvPath,
const std::list<std::string> & logTail,
std::string & msg);
/**
* A goal for building some or all of the outputs of a derivation.
*/