wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +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/libutil/logging.cc
View file

@ -45,6 +45,13 @@ public:
writeToStderr(prefix + (tty ? fs.s : filterANSIEscapes(fs.s)) + "\n");
}
void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent)
{
if (lvl <= verbosity && !s.empty())
log(lvl, s + "...");
}
};
Verbosity verbosity = lvlInfo;
@ -76,11 +83,11 @@ Logger * makeDefaultLogger()
std::atomic<uint64_t> nextId{(uint64_t) getpid() << 32};
Activity::Activity(Logger & logger, ActivityType type,
Activity::Activity(Logger & logger, Verbosity lvl, ActivityType type,
const std::string & s, const Logger::Fields & fields, ActivityId parent)
: logger(logger), id(nextId++)
{
logger.startActivity(id, type, s, fields, parent);
logger.startActivity(id, lvl, type, s, fields, parent);
}
}

8
src/libutil/logging.hh
View file

@ -68,7 +68,7 @@ public:
virtual void warn(const std::string & msg);
virtual void startActivity(ActivityId act, ActivityType type,
virtual void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent) { };
virtual void stopActivity(ActivityId act) { };
@ -84,9 +84,13 @@ struct Activity
const ActivityId id;
Activity(Logger & logger, ActivityType type, const std::string & s = "",
Activity(Logger & logger, Verbosity lvl, ActivityType type, const std::string & s = "",
const Logger::Fields & fields = {}, ActivityId parent = curActivity);
Activity(Logger & logger, ActivityType type,
const Logger::Fields & fields = {}, ActivityId parent = curActivity)
: Activity(logger, lvlError, type, "", fields, parent) { };
Activity(const Activity & act) = delete;
~Activity()