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

nix-store --serve: Suppress log output on stderr when repeating a build

Browse source
This commit is contained in:
Eelco Dolstra 2016-12-06 17:43:39 +01:00
parent 6069b946ad
commit 7a3e7d0e61
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/build.cc
View file

@ -3047,7 +3047,8 @@ void DerivationGoal::handleEOF(int fd)
void DerivationGoal::flushLine() void DerivationGoal::flushLine()
{ {
if (settings.verboseBuild) if (settings.verboseBuild &&
(settings.printRepeatedBuilds || curRound == 1))
printError(filterANSIEscapes(currentLogLine, true)); printError(filterANSIEscapes(currentLogLine, true));
else { else {
logTail.push_back(currentLogLine); logTail.push_back(currentLogLine);

5
src/libstore/globals.hh
View file

@ -149,6 +149,11 @@ struct Settings {
before being killed (0 means no limit). */ before being killed (0 means no limit). */
unsigned long maxLogSize; unsigned long maxLogSize;
/* When build-repeat > 0 and verboseBuild == true, whether to
print repeated builds (i.e. builds other than the first one) to
stderr. Hack to prevent Hydra logs from being polluted. */
bool printRepeatedBuilds = true;
/* How often (in seconds) to poll for locks. */ /* How often (in seconds) to poll for locks. */
unsigned int pollInterval; unsigned int pollInterval;

1
src/nix-store/nix-store.cc
View file

@ -842,6 +842,7 @@ static void opServe(Strings opFlags, Strings opArgs)
settings.maxLogSize = readInt(in); settings.maxLogSize = readInt(in);
if (GET_PROTOCOL_MINOR(clientVersion) >= 3) if (GET_PROTOCOL_MINOR(clientVersion) >= 3)
settings.set("build-repeat", std::to_string(readInt(in))); settings.set("build-repeat", std::to_string(readInt(in)));
settings.printRepeatedBuilds = false;
}; };
while (true) { while (true) {