diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc
index 51e199ea5ceeadd63fe2df1f6b947df0388a39b3..a0cccceb4f753a7daf15b43afc6d437f1e75044e 100644
--- a/src/libmain/common-args.cc
+++ b/src/libmain/common-args.cc
@@ -1,5 +1,6 @@
#include "common-args.hh"
#include "globals.hh"
+#include "loggers.hh"
namespace nix {
@@ -38,6 +39,14 @@ MixCommonArgs::MixCommonArgs(const string & programName)
}},
});
+ addFlag({
+ .longName = "log-format",
+ .description = "Format of the logs. One of \"raw\", \"internal-json\", \"bar\" "
+ "or \"bar-with-logs\".",
+ .labels = {"format"},
+ .handler = {[](std::string format) { setLogFormat(format); }},
+ });
+
addFlag({
.longName = "max-jobs",
.shortName = 'j',
diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d3d5b104bd5b16a01b67e5a3c08e280c3b55a293
--- /dev/null
+++ b/src/libmain/loggers.cc
@@ -0,0 +1,47 @@
+#include "loggers.hh"
+#include "../nix/progress-bar.hh"
+
+namespace nix {
+
+LogFormat defaultLogFormat = LogFormat::raw;
+
+LogFormat parseLogFormat(const string &logFormatStr) {
+ if (logFormatStr == "raw")
+ return LogFormat::raw;
+ 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(format("option 'log-format' has an invalid value '%s'") %
+ logFormatStr);
+}
+
+Logger *makeDefaultLogger() {
+ switch (defaultLogFormat) {
+ case LogFormat::raw:
+ return makeSimpleLogger();
+ case LogFormat::internalJson:
+ return makeJSONLogger(*makeSimpleLogger());
+ case LogFormat::bar:
+ return makeProgressBar();
+ case LogFormat::barWithLogs:
+ return makeProgressBar(true);
+ }
+}
+
+void setLogFormat(const string &logFormatStr) {
+ setLogFormat(parseLogFormat(logFormatStr));
+}
+
+void setLogFormat(const LogFormat &logFormat) {
+ defaultLogFormat = logFormat;
+ createDefaultLogger();
+}
+
+void createDefaultLogger() {
+ logger = makeDefaultLogger();
+}
+
+}
diff --git a/src/libmain/loggers.hh b/src/libmain/loggers.hh
new file mode 100644
index 0000000000000000000000000000000000000000..f50cbb682fe59ac5d4bbd3fb547f7dccf2f6b91f
--- /dev/null
+++ b/src/libmain/loggers.hh
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "types.hh"
+
+namespace nix {
+
+enum class LogFormat {
+ raw,
+ internalJson,
+ bar,
+ barWithLogs,
+};
+
+void setLogFormat(const string &logFormatStr);
+void setLogFormat(const LogFormat &logFormat);
+
+void createDefaultLogger();
+
+}
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 3cc4ef8f15b91a686aee5be19e01e6f772ad2413..6aec16e58d412a36b6e1c990dff5a5ffadbe72ab 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -18,7 +18,7 @@ void setCurActivity(const ActivityId activityId)
curActivity = activityId;
}
-Logger * logger = makeDefaultLogger();
+Logger * logger = makeSimpleLogger();
void Logger::warn(const std::string & msg)
{
@@ -94,7 +94,7 @@ void writeToStderr(const string & s)
}
}
-Logger * makeDefaultLogger()
+Logger * makeSimpleLogger()
{
return new SimpleLogger();
}
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 18c24d50877806c93cdaf7b2eb410dcc83a7f833..e319790fccd2afca636edf9e80a70a4a1dcb21a5 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -63,6 +63,8 @@ public:
virtual ~Logger() { }
+ virtual void stop() { };
+
virtual void log(Verbosity lvl, const FormatOrString & fs) = 0;
void log(const FormatOrString & fs)
@@ -141,7 +143,7 @@ struct PushActivity
extern Logger * logger;
-Logger * makeDefaultLogger();
+Logger * makeSimpleLogger();
Logger * makeJSONLogger(Logger & prevLogger);
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 71db92d772aebe56c5b11caf9800ecd6ce78c53f..e0a99152b56e2d89bbb48c3590799665639755b5 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -989,7 +989,7 @@ pid_t startProcess(std::function<void()> fun, const ProcessOptions & options)
{
auto wrapper = [&]() {
if (!options.allowVfork)
- logger = makeDefaultLogger();
+ logger = makeSimpleLogger();
try {
#if __linux__
if (options.dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) == -1)
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 0a058a31b495bc418d1c5c79711d7ee2b6ff2866..8649de5e9e8839599f81f8fb01941924142aa50b 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -472,6 +472,8 @@ static void _main(int argc, char * * argv)
restoreSignals();
+ logger->stop();
+
execvp(shell->c_str(), argPtrs.data());
throw SysError("executing shell '%s'", *shell);
@@ -521,6 +523,8 @@ static void _main(int argc, char * * argv)
if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>())
store2->addPermRoot(store->parseStorePath(symlink.second), absPath(symlink.first), true);
+ logger->stop();
+
for (auto & path : outPaths)
std::cout << path << '\n';
}
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index d62febaff53dd0475b25b72a917f8e5103b47cf1..f7b04eb2bfa37bbf294c08cf32008739b85293b7 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -1446,6 +1446,8 @@ static int _main(int argc, char * * argv)
globals.state->printStats();
+ logger->stop();
+
return 0;
}
}
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 3a3060ad82d8f3c1947c64d4c431dc4755bd28d9..708591b141476ea6e58ba0085a7a4d3ac916d345 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -1098,6 +1098,8 @@ static int _main(int argc, char * * argv)
op(opFlags, opArgs);
+ logger->stop();
+
return 0;
}
}
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 1120ba5efa4bf7d08973a3c76d12e693f5c90792..203901168b93aff5784465a732c883aa127673d7 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -10,6 +10,7 @@
#include "progress-bar.hh"
#include "filetransfer.hh"
#include "finally.hh"
+#include "loggers.hh"
#include <sys/types.h>
#include <sys/socket.h>
@@ -90,7 +91,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
.longName = "print-build-logs",
.shortName = 'L',
.description = "print full build logs on stderr",
- .handler = {&printBuildLogs, true},
+ .handler = {[&]() {setLogFormat(LogFormat::barWithLogs); }},
});
addFlag({
@@ -165,6 +166,10 @@ void mainWrapped(int argc, char * * argv)
verbosity = lvlWarn;
settings.verboseBuild = false;
+ setLogFormat("bar");
+
+ Finally f([] { logger->stop(); });
+
NixArgs args;
args.parseCmdline(argvToStrings(argc, argv));
@@ -178,10 +183,6 @@ void mainWrapped(int argc, char * * argv)
&& args.command->first != "upgrade-nix")
settings.requireExperimentalFeature("nix-command");
- Finally f([]() { stopProgressBar(); });
-
- startProgressBar(args.printBuildLogs);
-
if (args.useNet && !haveInternet()) {
warn("you don't have Internet access; disabling some network-dependent features");
args.useNet = false;
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc
index c677010989eafa740b41c970a17dc43801b25610..828541bfebd47b533625a8460b99e392503e584e 100644
--- a/src/nix/progress-bar.cc
+++ b/src/nix/progress-bar.cc
@@ -106,7 +106,7 @@ public:
updateThread.join();
}
- void stop()
+ void stop() override
{
auto state(state_.lock());
if (!state->active) return;
@@ -457,11 +457,17 @@ public:
}
};
-void startProgressBar(bool printBuildLogs)
+Logger *makeProgressBar(bool printBuildLogs)
{
- logger = new ProgressBar(
+ return new ProgressBar(
printBuildLogs,
- isatty(STDERR_FILENO) && getEnv("TERM").value_or("dumb") != "dumb");
+ isatty(STDERR_FILENO) && getEnv("TERM").value_or("dumb") != "dumb"
+ );
+}
+
+void startProgressBar(bool printBuildLogs)
+{
+ logger = makeProgressBar(printBuildLogs);
}
void stopProgressBar()
diff --git a/src/nix/progress-bar.hh b/src/nix/progress-bar.hh
index 4d61175c24e4f7cfa384bcc1036aaf54c9ca5eec..60d0a2076cc302126304a9b9ea1d134951d7e1a9 100644
--- a/src/nix/progress-bar.hh
+++ b/src/nix/progress-bar.hh
@@ -4,6 +4,8 @@
namespace nix {
+Logger* makeProgressBar(bool printBuildLogs = false);
+
void startProgressBar(bool printBuildLogs = false);
void stopProgressBar();