forked from lix-project/lix
![Eelco Dolstra](/assets/img/avatar_default.png)
This was caused by -L calling setLogFormat() again, which caused the creation of a new progress bar without destroying the old one. So we had two progress bars clobbering each other. We should change 'logger' to be a smart pointer, but I'll do that in a future PR. Fixes #6931.
57 lines
1.5 KiB
C++
57 lines
1.5 KiB
C++
#include "loggers.hh"
|
|
#include "progress-bar.hh"
|
|
#include "util.hh"
|
|
|
|
namespace nix {
|
|
|
|
LogFormat defaultLogFormat = LogFormat::raw;
|
|
|
|
LogFormat parseLogFormat(const std::string & logFormatStr) {
|
|
if (logFormatStr == "raw" || getEnv("NIX_GET_COMPLETIONS"))
|
|
return LogFormat::raw;
|
|
else if (logFormatStr == "raw-with-logs")
|
|
return LogFormat::rawWithLogs;
|
|
else if (logFormatStr == "internal-json")
|
|
return LogFormat::internalJSON;
|
|
else if (logFormatStr == "bar")
|
|
return LogFormat::bar;
|
|
else if (logFormatStr == "bar-with-logs")
|
|
return LogFormat::barWithLogs;
|
|
throw Error("option 'log-format' has an invalid value '%s'", logFormatStr);
|
|
}
|
|
|
|
Logger * makeDefaultLogger() {
|
|
switch (defaultLogFormat) {
|
|
case LogFormat::raw:
|
|
return makeSimpleLogger(false);
|
|
case LogFormat::rawWithLogs:
|
|
return makeSimpleLogger(true);
|
|
case LogFormat::internalJSON:
|
|
return makeJSONLogger(*makeSimpleLogger(true));
|
|
case LogFormat::bar:
|
|
return makeProgressBar();
|
|
case LogFormat::barWithLogs: {
|
|
auto logger = makeProgressBar();
|
|
logger->setPrintBuildLogs(true);
|
|
return logger;
|
|
}
|
|
default:
|
|
abort();
|
|
}
|
|
}
|
|
|
|
void setLogFormat(const std::string & logFormatStr) {
|
|
setLogFormat(parseLogFormat(logFormatStr));
|
|
}
|
|
|
|
void setLogFormat(const LogFormat & logFormat) {
|
|
defaultLogFormat = logFormat;
|
|
createDefaultLogger();
|
|
}
|
|
|
|
void createDefaultLogger() {
|
|
logger = makeDefaultLogger();
|
|
}
|
|
|
|
}
|