Add ability to log objects

Piotrekol · Sep 27, 2016 · 8fe4432 · 8fe4432
1 parent 5190972
commit 8fe4432
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/ConsoleLogger.cs
@@ -29,18 +29,19 @@ public void Dispose()
             FreeConsole();
         }
 
-        public void Log(string logMessage, LogLevel loglvevel, params string[] vals)
+        public void Log(object logMessage, LogLevel loglvevel, params string[] vals)
         {
             if (_settings.Get<int>(_names.LogLevel) >= loglvevel.GetHashCode())
             {
+                string message = logMessage.ToString();
                 string prefix = string.Empty;
-                while (logMessage.StartsWith(">"))
+                while (message.StartsWith(">"))
                 {
                     prefix += "\t";
-                    logMessage = logMessage.Substring(1);
+                    message = message.Substring(1);
                 }
-                logMessage = prefix + logMessage;
-                Console.WriteLine(@"{0} - {1}", DateTime.Now.ToString("T"), string.Format(logMessage, vals));
+                message = prefix + message;
+                Console.WriteLine(@"{0} - {1}", DateTime.Now.ToString("T"), string.Format(message, vals));
             }
         }
     }

diff --git a/osu!StreamCompanion/Code/Core/Loggers/EmptyLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/EmptyLogger.cs
@@ -5,7 +5,7 @@ namespace osu_StreamCompanion.Code.Core.Loggers
 {
     class EmptyLogger : ILogger
     {
-        public void Log(string logMessage, LogLevel loglvevel, params string[] vals)
+        public void Log(object logMessage, LogLevel loglvevel, params string[] vals)
         {
 
         }

diff --git a/osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/FileLogger.cs
@@ -46,12 +46,13 @@ private string GetRelativeSaveLocation()
         {
             return Path.Combine(_logsSaveFolderName, startTime.ToString("yyyy-MM-dd") + ".txt");
         }
-        public void Log(string logMessage, LogLevel loglvevel, params string[] vals)
+        public void Log(object logMessage, LogLevel loglvevel, params string[] vals)
         {
             try
             {
+                string message = logMessage.ToString();
                 if (_settings.Get<int>(_names.LogLevel) >= loglvevel.GetHashCode())
-                    _saver.append(CurrentLogSaveLocation, string.Format(logMessage, vals) + Environment.NewLine);
+                    _saver.append(CurrentLogSaveLocation, string.Format(message, vals) + Environment.NewLine);
             }
             catch
             {

diff --git a/osu!StreamCompanion/Code/Core/Loggers/MainLogger.cs b/osu!StreamCompanion/Code/Core/Loggers/MainLogger.cs
@@ -22,7 +22,7 @@ public void AddLogger(ILogger logger)
         {
             _loggers.Add(logger);
         }
-        public void Log(string logMessage,LogLevel logLevel, params string[] vals)
+        public void Log(object logMessage, LogLevel logLevel, params string[] vals)
         {
             _logger?.Log(logMessage, logLevel, vals);
             for (int i = 0; i < _loggers.Count; i++)

diff --git a/osu!StreamCompanion/Code/Interfeaces/ILogger.cs b/osu!StreamCompanion/Code/Interfeaces/ILogger.cs
@@ -4,6 +4,6 @@ namespace osu_StreamCompanion.Code.Interfeaces
 {
     public interface ILogger
     {
-        void Log(string logMessage, LogLevel loglvevel, params string[] vals);
+        void Log(object logMessage, LogLevel loglvevel, params string[] vals);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ namespace osu_StreamCompanion.Code.Core.Loggers @@
     {
         class EmptyLogger : ILogger
         {
-            public void Log(string logMessage, LogLevel loglvevel, params string[] vals)
+            public void Log(object logMessage, LogLevel loglvevel, params string[] vals)
             {
             }
@@ Expand Down @@