Merge branch 'feature/sections-7-10-gaps' into main

src/NATS.Server.Host/Program.cs

@@ -1,9 +1,10 @@
 using NATS.Server;
 using Serilog;
+using Serilog.Sinks.SystemConsole.Themes;
 
 var options = new NatsOptions();
 
-// Simple CLI argument parsing
+// Parse ALL CLI flags into NatsOptions first
 for (int i = 0; i < args.Length; i++)
 {
     switch (args[i])
@@ -52,27 +53,42 @@ for (int i = 0; i < args.Length; i++)
         case "-D" or "--debug":
             options.Debug = true;
             break;
-        case "-V" or "--trace":
+        case "-V" or "-T" or "--trace":
             options.Trace = true;
             break;
         case "-DV":
             options.Debug = true;
             options.Trace = true;
             break;
-        case "-l" or "--log" when i + 1 < args.Length:
+        case "-l" or "--log" or "--log_file" when i + 1 < args.Length:
             options.LogFile = args[++i];
             break;
         case "--log_size_limit" when i + 1 < args.Length:
             options.LogSizeLimit = long.Parse(args[++i]);
             break;
+        case "--log_max_files" when i + 1 < args.Length:
+            options.LogMaxFiles = int.Parse(args[++i]);
+            break;
+        case "--logtime" when i + 1 < args.Length:
+            options.Logtime = bool.Parse(args[++i]);
+            break;
+        case "--logtime_utc":
+            options.LogtimeUTC = true;
+            break;
+        case "--syslog":
+            options.Syslog = true;
+            break;
+        case "--remote_syslog" when i + 1 < args.Length:
+            options.RemoteSyslog = args[++i];
+            break;
     }
 }
 
-// Configure Serilog based on options
+// Build Serilog configuration from options
 var logConfig = new LoggerConfiguration()
-    .Enrich.FromLogContext()
-    .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}");
+    .Enrich.FromLogContext();
 
+// Set minimum level based on flags
 if (options.Trace)
     logConfig.MinimumLevel.Verbose();
 else if (options.Debug)
@@ -80,12 +96,39 @@ else if (options.Debug)
 else
     logConfig.MinimumLevel.Information();
 
-if (options.LogFile != null)
+// Build output template
+var timestampFormat = options.LogtimeUTC
+    ? "{Timestamp:yyyy/MM/dd HH:mm:ss.ffffff} "
+    : "{Timestamp:HH:mm:ss} ";
+var template = options.Logtime
+    ? $"[{timestampFormat}{{Level:u3}}] {{Message:lj}}{{NewLine}}{{Exception}}"
+    : "[{Level:u3}] {Message:lj}{NewLine}{Exception}";
+
+// Console sink with color auto-detection
+if (!Console.IsOutputRedirected)
+    logConfig.WriteTo.Console(outputTemplate: template, theme: AnsiConsoleTheme.Code);
+else
+    logConfig.WriteTo.Console(outputTemplate: template);
+
+// File sink with rotation
+if (!string.IsNullOrEmpty(options.LogFile))
 {
     logConfig.WriteTo.File(
         options.LogFile,
         fileSizeLimitBytes: options.LogSizeLimit > 0 ? options.LogSizeLimit : null,
-        rollOnFileSizeLimit: options.LogSizeLimit > 0);
+        retainedFileCountLimit: options.LogMaxFiles > 0 ? options.LogMaxFiles : null,
+        rollOnFileSizeLimit: options.LogSizeLimit > 0,
+        outputTemplate: template);
+}
+
+// Syslog sink
+if (!string.IsNullOrEmpty(options.RemoteSyslog))
+{
+    logConfig.WriteTo.UdpSyslog(options.RemoteSyslog);
+}
+else if (options.Syslog)
+{
+    logConfig.WriteTo.LocalSyslog("nats-server");
 }
 
 Log.Logger = logConfig.CreateLogger();
@@ -96,6 +139,14 @@ using var server = new NatsServer(options, loggerFactory);
 // Register signal handlers
 server.HandleSignals();
 
+server.ReOpenLogFile = () =>
+{
+    Log.Information("Reopening log file");
+    Log.CloseAndFlush();
+    Log.Logger = logConfig.CreateLogger();
+    Log.Information("File log re-opened");
+};
+
 // Ctrl+C triggers graceful shutdown
 Console.CancelKeyPress += (_, e) =>
 {