Make the logger customisable

Add a new `--log-format` cli argument to change the format of the logs.
The possible values are
- raw (the default one for old-style commands)
- bar (the default one for new-style commands)
- bar-with-logs (equivalent to `--print-build-logs`)
- internal-json (the internal machine-readable json format)

3 files changed, 6 insertions, 4 deletions

diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 3cc4ef8f1..6aec16e58 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 18c24d508..e319790fc 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 71db92d77..e0a99152b 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)