Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 8 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
index d082aeca6..64f1913fb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
@@ -10,13 +10,17 @@ using Tango.Logging;
 
 namespace Tango.MachineStudio.Logging.Parsing
 {
-    public class ApplicationLogFileParser : ILogFileParser<MessageLogItem>
+    public class ApplicationLogFileParser : ILogFileParser<LogItemBase>
     {
         public List<LogFile> GetLogFiles()
         {
             List<LogFile> logFiles = new List<LogFile>();
 
-            foreach (var file in Directory.GetFiles(FileLogger.DefaultLogsFolder, "*.log").Where(x => Path.GetFileName(x).StartsWith("Tango.MachineStudio.UI")))
+            FileLogger logger = LogManager.Default.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger;
+
+            String logFile = logger != null ? logger.LogFile : null;
+
+            foreach (var file in Directory.GetFiles(FileLogger.DefaultLogsFolder, "*.log").Where(x => Path.GetFileName(x).StartsWith("Tango.MachineStudio.UI") && x != logger.LogFile))
             {
                 String dateString = Path.GetFileNameWithoutExtension(file).Replace("Tango.MachineStudio.UI-", "");
                 DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
@@ -26,9 +30,9 @@ namespace Tango.MachineStudio.Logging.Parsing
             return logFiles;
         }
 
-        public List<MessageLogItem> Parse(LogFile logFile)
+        public List<LogItemBase> Parse(LogFile logFile)
         {
-            List<MessageLogItem> logItems = new List<MessageLogItem>();
+            List<LogItemBase> logItems = new List<LogItemBase>();
 
             String text = File.ReadAllText(logFile.File);
             var logs = Regex.Split(text, @"(\[\d{2}:\d{2}:\d{2}.\d{2}\])");