Merge pull request #129 from microsoft/nofilelogdefault

Disable file logging by default in Linux server.
microsoft · Jan 25, 2024 · 373506b · 373506b
2 parents 76fdd15 + 888c42f
commit 373506b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/common/server/NetRemoteServerConfiguration.cxx b/src/common/server/NetRemoteServerConfiguration.cxx
@@ -26,6 +26,11 @@ ConfigureCliAppOptions(CLI::App& app, NetRemoteServerConfiguration& config)
         config.LogVerbosity,
         "The log verbosity level. Supply multiple times to increase verbosity (0=warnings, errors, and fatal messages, 1=info messages, 2=debug messages, 3=verbose messages)");
 
+    app.add_flag(
+        "--enable-file-logging",
+        config.EnableFileLogging,
+        "Enable logging to file (disabled by default)");
+
     return app;
 }
 

diff --git a/src/common/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx b/src/common/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx
@@ -64,6 +64,11 @@ struct NetRemoteServerConfiguration
      * and a level of 3 or above will show all verbose messages.
      */
     uint32_t LogVerbosity{ 0 };
+
+    /**
+     * @brief Whether to enable logging to file or not.
+     */
+    bool EnableFileLogging{ false };
 
     /**
      * @brief Access point manager instance.

diff --git a/src/linux/server/Main.cxx b/src/linux/server/Main.cxx
@@ -41,10 +41,11 @@ main(int argc, char *argv[])
 
     // Configure logging, appending all loggers to the default instance.
     plog::init<notstd::to_underlying(LogInstanceId::Console)>(logSeverity, &colorConsoleAppender);
-    plog::init<notstd::to_underlying(LogInstanceId::File)>(logSeverity, &rollingFileAppender);
-    plog::init(logSeverity)
-        .addAppender(plog::get<notstd::to_underlying(LogInstanceId::Console)>())
-        .addAppender(plog::get<notstd::to_underlying(LogInstanceId::File)>());
+    plog::init(logSeverity).addAppender(plog::get<notstd::to_underlying(LogInstanceId::Console)>());
+    if (configuration.EnableFileLogging) {
+        plog::init<notstd::to_underlying(LogInstanceId::File)>(logSeverity, &rollingFileAppender);
+        plog::init(logSeverity).addAppender(plog::get<notstd::to_underlying(LogInstanceId::File)>());
+    }
 
     // Create an access point manager and discovery agent.
     {