wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00
Code Activity

Give activities a verbosity level again

Browse source 
And print them (separately from the progress bar) given sufficient -v
flags.
This commit is contained in:
Eelco Dolstra 2017-08-28 19:13:24 +02:00
parent cfc8132391
commit 2cc345b95f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
10 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/nix-daemon/nix-daemon.cc
View file

@ -149,12 +149,17 @@ struct TunnelLogger : public Logger
}
}
void startActivity(ActivityId act, ActivityType type,
void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent) override
{
if (GET_PROTOCOL_MINOR(clientVersion) < 20) return;
if (GET_PROTOCOL_MINOR(clientVersion) < 20) {
if (!s.empty())
log(lvl, s + "...");
return;
}
StringSink buf;
buf << STDERR_START_ACTIVITY << act << type << s << fields << parent;
buf << STDERR_START_ACTIVITY << act << lvl << type << s << fields << parent;
enqueueMsg(*buf.s);
}