Implemented AutoLogRemoval & MaxFileSizeLimit to FileLogger, LogFileParser and TFS bug reporting!!!

3 files changed, 48 insertions, 19 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
index 26d6425bf..c28c5fcba 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
@@ -53,6 +53,21 @@ namespace Tango.PPC.BugReporting.TFS
             }
         }
 
+        private string[] GetLogFiles(FileLogger logger)
+        {
+            string[] fileEntries = new string[1];
+            fileEntries[0] = logger.LogFile;
+            string fileName = Path.GetFileNameWithoutExtension(logger.LogFile);
+            int indexPos = fileName.IndexOf(FileLogger.FILE_SET_EXTENSION);
+            if (indexPos > 0)
+            {
+                string extension = Path.GetExtension(logger.LogFile);
+                fileName = fileName.Substring(0, indexPos);
+                fileEntries = Directory.GetFiles(logger.Folder, $"{fileName}*{extension}").Where(x => Path.GetFileName(x).StartsWith(logger.Tag)).OrderBy(x => x.Length).ThenBy(x => x).ToArray();
+            }
+            return fileEntries;
+        }
+
         public async Task SubmitBug(String title, String steps, TeamMember createdBy, TeamMember assignedTo, Severity severity)
         {
             LogManager.Log("Submitting bug report...");
@@ -87,31 +102,36 @@ namespace Tango.PPC.BugReporting.TFS
                 if (appFileLogger != null)
                 {
                     LogManager.Log($"Attaching application log file ${appFileLogger.LogFile}");
-
-                    var appLogFile = tempFolder.CreateImaginaryFile();
-                    File.Copy(appFileLogger.LogFile, appLogFile.Path);
-
-                    item.Attachments.Add(new Attachment()
+                    string[] logFiles = GetLogFiles(appFileLogger);
+                    foreach (string file in logFiles)
                     {
-                        Description = "Application Log File",
-                        FilePath = appLogFile.Path,
-                        Name = Path.GetFileName(appFileLogger.LogFile),
-                    });
+                        var appLogFile = tempFolder.CreateImaginaryFile();
+                        File.Copy(file, appLogFile.Path);
+                        item.Attachments.Add(new Attachment()
+                        {
+                            Description = "Application Log File",
+                            FilePath = appLogFile.Path,
+                            Name = Path.GetFileName(file),
+                        });
+                    }
                 }
 
                 if (embeddedFileLogger != null && File.Exists(embeddedFileLogger.LogFile))
                 {
                     LogManager.Log($"Attaching embedded log file ${embeddedFileLogger.LogFile}");
 
-                    var embeddedLogFile = tempFolder.CreateImaginaryFile();
-                    File.Copy(embeddedFileLogger.LogFile, embeddedLogFile.Path);
-
-                    item.Attachments.Add(new Attachment()
+                    string[] logFiles = GetLogFiles(embeddedFileLogger);
+                    foreach (string file in logFiles)
                     {
-                        Description = "Embedded Log File",
-                        FilePath = embeddedLogFile.Path,
-                        Name = Path.GetFileName(embeddedFileLogger.LogFile),
-                    });
+                        var embeddedLogFile = tempFolder.CreateImaginaryFile();
+                        File.Copy(file, embeddedLogFile.Path);
+                        item.Attachments.Add(new Attachment()
+                        {
+                            Description = "Embedded Log File",
+                            FilePath = embeddedLogFile.Path,
+                            Name = Path.GetFileName(file),
+                        });
+                    }
                 }
 
                 SystemInformationModel sysModel = new SystemInformationModel();
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs
index 8d57df139..e6f090fdd 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs
@@ -68,7 +68,7 @@ namespace Tango.PPC.Jobs
         #region events
         private void JobOutlineControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (_parentScrollViewer == null)
+            if (_parentScrollViewer != null)
             {
                 _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
             }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
index 0bd9f9d1d..bd3f04958 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
@@ -11,6 +11,7 @@ using Tango.BL;
 using Tango.Core;
 using Tango.Core.DI;
 using Tango.Core.Helpers;
+using Tango.Integration.Operation;
 using Tango.Logging;
 using Tango.PPC.Common;
 using Tango.PPC.Common.EventLogging;
@@ -45,9 +46,17 @@ namespace Tango.PPC.UI
             StartupArgs = e.Args;
 
             //LogManager.RegisterLogger(new ConsoleLogger("Tango PPC Debug"));
-            LogManager.RegisterLogger(new FileLogger());
+            LogManager.RegisterLogger(new FileLogger() { EnableAutoLogRemoval = true, EnableMaxFileSizeLimit = true });
             LogManager.RegisterLogger(new VSOutputLogger());
 
+            //Configure machine operator logger.
+            var operatorLogger = MachineOperator.EmbeddedLogManager.RegisteredLoggers.SingleOrDefault(x => x is FileLogger) as FileLogger;
+            if (operatorLogger != null)
+            {
+                operatorLogger.EnableAutoLogRemoval = true;
+                operatorLogger.EnableMaxFileSizeLimit = true;
+            }
+
             LogManager.Log("Application Started...");
 
             base.OnStartup(e);