Merge libmain/loggers into libutil/logging

src/libmain/common-args.cc

@@ -2,7 +2,6 @@
 #include "args/root.hh"
 #include "globals.hh"
 #include "logging.hh"
-#include "loggers.hh"
 #include "util.hh"
 
 namespace nix {

src/libmain/shared.cc

@@ -3,7 +3,6 @@
 #include "shared.hh"
 #include "store-api.hh"
 #include "gc-store.hh"
-#include "loggers.hh"
 #include "progress-bar.hh"
 #include "signals.hh"
 

src/libutil/local.mk

@@ -8,7 +8,16 @@ libutil_SOURCES := $(wildcard $(d)/*.cc $(d)/signature/*.cc)
 
 libutil_CXXFLAGS += -I src/libutil
 
-libutil_LDFLAGS += $(THREAD_LDFLAGS) $(LIBCURL_LIBS) $(SODIUM_LIBS) $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(LIBARCHIVE_LIBS) $(BOOST_LDFLAGS) -lboost_context
+libutil_LDFLAGS += \
+	$(THREAD_LDFLAGS) \
+	$(LIBCURL_LIBS) \
+	$(SODIUM_LIBS) \
+	$(OPENSSL_LIBS) \
+	$(LIBBROTLI_LIBS) \
+	$(LIBARCHIVE_LIBS) \
+	$(BOOST_LDFLAGS) \
+	-lboost_context \
+	$(libmain_LDFLAGS)
 
 $(foreach i, $(wildcard $(d)/args/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/args, 0644)))

src/libutil/logging.cc

@@ -333,4 +333,101 @@ Activity::~Activity()
     }
 }
 
+LogFormat defaultLogFormat = LogFormat::raw;
+
+std::optional<LogFormat> parseLogFormat(const std::string & str)
+{
+    if (str == "raw" || getEnv("NIX_GET_COMPLETIONS"))
+        return LogFormat::raw;
+    else if (str == "raw-with-logs")
+        return LogFormat::rawWithLogs;
+    else if (str == "internal-json")
+        return LogFormat::internalJSON;
+    else if (str == "bar")
+        return LogFormat::bar;
+    else if (str == "bar-with-logs")
+        return LogFormat::barWithLogs;
+    else
+        return std::nullopt;
+}
+
+std::ostream & operator<<(std::ostream & output, const LogFormat & format)
+{
+    switch (format) {
+        case LogFormat::raw:
+            return output << "raw";
+        case LogFormat::rawWithLogs:
+            return output << "raw-with-logs";
+        case LogFormat::internalJSON:
+            return output << "internal-json";
+        case LogFormat::bar:
+            return output << "bar";
+        case LogFormat::barWithLogs:
+            return output << "bar-with-logs";
+        default:
+            abort();
+    }
+    return output;
+}
+
+std::string logFormatToString(const LogFormat & format)
+{
+    std::ostringstream stream;
+    stream << format;
+    return stream.str();
+}
+
+void to_json(nlohmann::json &j, const LogFormat &format)
+{
+    j = logFormatToString(format);
+}
+
+void from_json(const nlohmann::json &j, LogFormat &format)
+{
+    auto parsed = parseLogFormat(j.template get<std::string>());
+    if (parsed.has_value()) {
+        format = parsed.value();
+    } else {
+        // Error ID 302 seems to fit best:
+        // "During implicit or explicit value conversion, the JSON type
+        // must be compatible to the target type."
+        throw nlohmann::detail::type_error::create(302, "string is not a valid log-format", &j);
+    }
+}
+
+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 LogFormat & logFormat)
+{
+    if (defaultLogFormat == logFormat) {
+        return;
+    }
+    defaultLogFormat = logFormat;
+    createDefaultLogger();
+}
+
+void createDefaultLogger()
+{
+    logger = makeDefaultLogger();
+}
+
 }

src/libutil/logging.hh

@@ -6,9 +6,44 @@
 #include "config.hh"
 
 #include <nlohmann/json_fwd.hpp>
+#include <nlohmann/detail/exceptions.hpp>
 
 namespace nix {
 
+enum class LogFormat {
+  /**
+   * The format used by old-style commands like `nix-build`, but without build
+   * logs.
+   */
+  raw,
+  /**
+   * The format used by old-style commands like `nix-build`.
+   */
+  rawWithLogs,
+  /**
+   * A JSON format for internal use.
+   */
+  internalJSON,
+  /**
+   * The progress bar format used by `nix` (v3) commands.
+   */
+  bar,
+  /**
+   * The progress bar format used by `nix` (v3) commands, but with build logs.
+   */
+  barWithLogs,
+};
+
+std::ostream & operator<<(std::ostream & output, const LogFormat & format);
+std::string logFormatToString(const LogFormat & format);
+std::optional<LogFormat> parseLogFormat(const std::string & str);
+
+void to_json(nlohmann::json & j, const LogFormat & format);
+void from_json(const nlohmann::json & j, LogFormat & format);
+
+void setLogFormat(const LogFormat & logFormat);
+void createDefaultLogger();
+
 typedef enum {
     actUnknown = 0,
     actCopyPath = 100,
@@ -186,6 +221,8 @@ Logger * makeSimpleLogger(bool printBuildLogs = true);
 
 Logger * makeJSONLogger(Logger & prevLogger);
 
+Logger * makeProgressBar();
+
 std::optional<nlohmann::json> parseJSONMessage(const std::string & msg);
 
 bool handleJSONLogMessage(nlohmann::json & json,

src/nix/main.cc

@@ -13,7 +13,6 @@
 #include "store-api.hh"
 #include "filetransfer.hh"
 #include "finally.hh"
-#include "loggers.hh"
 #include "markdown.hh"
 #include "memory-input-accessor.hh"