--log-no-color and --log-flush (#36)

Author: ewasjon

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## []
+
+- Added `--log-no-color` to disable colored logging output
+- Added `--log-flush` to flush logging after every line
+
 ## [4.0.3] 2025-03-12
 
 - Building and publishing containers to GHCR

dependency/loglet/include/loglet/loglet.hpp

@@ -187,6 +187,8 @@ enum class Level {
 void uninitialize();
 
 void set_level(Level level);
+void set_color_enable(bool enabled);
+void set_always_flush(bool flush);
 void set_module_level(char const* module, Level level);
 void disable_module(char const* module);
 bool is_module_enabled(char const* module);

dependency/loglet/loglet.cpp

@@ -45,7 +45,9 @@ struct Module {
     Level       level;
 };
 
-static Level              sLevel = Level::Debug;
+static Level              sLevel        = Level::Debug;
+static bool               sColorEnabled = true;
+static bool               sAlwaysFlush  = false;
 static std::vector<Scope> sScopes;
 
 static std::unordered_map<char const*, Module, HashModuleName, EqualModuleName> sModules;
@@ -78,6 +80,14 @@ void set_level(Level level) {
     sLevel = level;
 }
 
+void set_color_enable(bool enabled) {
+    sColorEnabled = enabled;
+}
+
+void set_always_flush(bool flush) {
+    sAlwaysFlush = flush;
+}
+
 void set_module_level(char const* module, Level level) {
     auto& module_ref = get_or_add_module(module);
     module_ref.level = level;
@@ -130,6 +140,7 @@ static char const* level_to_string(Level level) {
 }
 
 static char const* level_to_color(Level level) {
+    if (!sColorEnabled) return "";
     switch (level) {
     case Level::Trace: return COLOR_CYAN;
     case Level::Verbose: return COLOR_BLUE;
@@ -162,8 +173,18 @@ void log(char const* module, Level level, char const* message) {
         fflush(stdout);
     }
 
-    fprintf(file, "%s%s%s[%10s] %*s%s%s\n", start_color, level_to_string(level), buffer, module,
-            static_cast<int>(sScopes.size() * 2), "", message, stop_color);
+    if (sAlwaysFlush) {
+        fflush(file);
+    }
+
+    char const indent_buffer[64 + 1] =
+        "                                                                ";
+    auto indent_length = static_cast<int>(sScopes.size() * 2);
+    if (indent_length > 64) {
+        indent_length = 64;
+    }
+    fprintf(file, "%s%s%s[%10s] %.*s%s%s\n", start_color, level_to_string(level), buffer, module,
+            static_cast<int>(sScopes.size() * 2), indent_buffer, message, stop_color);
 }
 
 void logf(char const* module, Level level, char const* format, ...) {

examples/client/config.hpp

@@ -158,6 +158,8 @@ struct DataTracingConfig {
 
 struct LoggingConfig {
     loglet::Level                                  log_level;
+    bool                                           color;
+    bool                                           flush;
     std::unordered_map<std::string, loglet::Level> module_levels;
 };
 

examples/client/config/logging.cpp

@@ -50,12 +50,26 @@ static args::ValueFlagList<std::string> gModules{
     "<module>=<level>",
     {"lm"},
 };
+static args::Flag gNoColor{
+    gGroup,
+    "no-color",
+    "Disable colored output",
+    {"log-no-color"},
+};
+static args::Flag gFlush{
+    gGroup,
+    "flush",
+    "Flush log after each line",
+    {"log-flush"},
+};
 
 static void setup() {}
 
 static void parse(Config* config) {
     auto& logging     = config->logging;
     logging.log_level = loglet::Level::Info;
+    logging.color     = gNoColor ? false : true;
+    logging.flush     = gFlush;
 
     if (gTrace) {
         logging.log_level = loglet::Level::Trace;

examples/client/main.cpp

@@ -458,6 +458,8 @@ int main(int argc, char** argv) {
     }
 
     loglet::set_level(config.logging.log_level);
+    loglet::set_color_enable(config.logging.color);
+    loglet::set_always_flush(config.logging.flush);
     for (auto const& [module, level] : config.logging.module_levels) {
         loglet::set_module_level(module.c_str(), level);
     }