Merge pull request #188 from Moonlight-Panel/ImproveLogging

Improved logging. Added better error handling for mysql database backup

Author: Masu-Baumgartner

Moonlight/App/Helpers/DatabaseCheckupService.cs

@@ -81,19 +81,32 @@ public async Task BackupDatabase()
         Logger.Info($"Saving it to: {file}");
         Logger.Info("Starting backup...");
 
-        var sw = new Stopwatch();
-        sw.Start();
+        try
+        {
+            var sw = new Stopwatch();
+            sw.Start();
 
-        await using MySqlConnection conn = new MySqlConnection(connectionString);
-        await using MySqlCommand cmd = new MySqlCommand();
-        using MySqlBackup mb = new MySqlBackup(cmd);
+            await using MySqlConnection conn = new MySqlConnection(connectionString);
+            await using MySqlCommand cmd = new MySqlCommand();
+            using MySqlBackup mb = new MySqlBackup(cmd);
 
-        cmd.Connection = conn;
-        await conn.OpenAsync();
-        mb.ExportToFile(file);
-        await conn.CloseAsync();
+            cmd.Connection = conn;
+            await conn.OpenAsync();
+            mb.ExportToFile(file);
+            await conn.CloseAsync();
 
-        sw.Stop();
-        Logger.Info($"Done. {sw.Elapsed.TotalSeconds}s");
+            sw.Stop();
+            Logger.Info($"Done. {sw.Elapsed.TotalSeconds}s");
+        }
+        catch (Exception e)
+        {
+            Logger.Fatal("-----------------------------------------------");
+            Logger.Fatal("Unable to create backup for moonlight database");
+            Logger.Fatal("Moonlight will start anyways in 30 seconds");
+            Logger.Fatal("-----------------------------------------------");
+            Logger.Fatal(e);
+            
+            Thread.Sleep(TimeSpan.FromSeconds(30));
+        }
     }
 }

Moonlight/App/Helpers/Logger.cs

@@ -10,75 +10,75 @@ public static class Logger
     public static void Verbose(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Verbose("{Message} {Channel}", message, channel);
+            .Verbose("{Message}", message);
     }
 
     public static void Info(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Information("{Message} {Channel}", message, channel);
+            .Information("{Message}", message);
     }
 
     public static void Debug(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Debug("{Message} {Channel}", message, channel);
+            .Debug("{Message}", message);
     }
 
     public static void Error(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Error("{Message} {Channel}", message, channel);
+            .Error("{Message}", message);
     }
 
     public static void Warn(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Warning("{Message} {Channel}", message, channel);
+            .Warning("{Message}", message);
     }
 
     public static void Fatal(string message, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Fatal("{Message} {Channel}", message, channel);
+            .Fatal("{Message}", message);
     }
     #endregion
 
     #region Exception method calls
     public static void Verbose(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Verbose(exception, "{Channel}", channel);
+            .Verbose(exception, "");
     }
 
     public static void Info(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Information(exception, "{Channel}", channel);
+            .Information(exception, "");
     }
 
     public static void Debug(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Debug(exception, "{Channel}", channel);
+            .Debug(exception, "");
     }
 
     public static void Error(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Error(exception, "{Channel}", channel);
+            .Error(exception, "");
     }
 
     public static void Warn(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Warning(exception, "{Channel}", channel);
+            .Warning(exception, "");
     }
 
     public static void Fatal(Exception exception, string channel = "default")
     {
         Log.ForContext("SourceContext", GetNameOfCallingClass())
-            .Fatal(exception, "{Channel}", channel);
+            .Fatal(exception, "");
     }
     #endregion
 

Moonlight/App/Services/ConfigService.cs

@@ -41,17 +41,13 @@ public ConfigService(StorageService storageService)
 
     public void Reload()
     {
-        Logger.Info($"Reading config from '{PathBuilder.File("storage", "configs", "config.json")}'");
-        
         Configuration = new ConfigurationBuilder().AddJsonStream(
             new MemoryStream(Encoding.ASCII.GetBytes(
                     File.ReadAllText(
                         PathBuilder.File("storage", "configs", "config.json")
                     )
                 )
             )).Build();
-
-        Logger.Info("Reloaded configuration file");
     }
 
     public IEnumerable<IConfigurationSection> GetChildren()

Moonlight/Program.cs

@@ -38,19 +38,31 @@ public class Program
     {
         public static async Task Main(string[] args)
         {
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Verbose()
-                .Enrich.FromLogContext()
-                .WriteTo.Console(
-                    outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}")
-                .CreateLogger();
+            // This will also copy all default config files
+            var configService = new ConfigService(new StorageService());
 
+            if (configService.DebugMode)
+            {
+                Log.Logger = new LoggerConfiguration()
+                    .MinimumLevel.Verbose()
+                    .Enrich.FromLogContext()
+                    .WriteTo.Console(
+                        outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}")
+                    .CreateLogger();
+            }
+            else
+            {
+                Log.Logger = new LoggerConfiguration()
+                    .MinimumLevel.Information()
+                    .Enrich.FromLogContext()
+                    .WriteTo.Console(
+                        outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}")
+                    .CreateLogger();
+            }
+            
             Logger.Info($"Working dir: {Directory.GetCurrentDirectory()}");
 
             Logger.Info("Running pre-init tasks");
-            
-            // This will also copy all default config files
-            var configService = new ConfigService(new StorageService());
             var databaseCheckupService = new DatabaseCheckupService(configService);
 
             await databaseCheckupService.Perform();