enhance logging and restart logic

Author: andreaskueffel

FileSyncAppWin/MainForm.cs

@@ -9,7 +9,13 @@ public MainForm(string[] args)
         {
             InitializeComponent();
             Args = args;
-            this.FormClosing += (s, e) => { FileSyncApp.Program.keepRunning = false; consoleThread?.Join(10_000); };
+            this.FormClosing += (s, e) => {
+                NewLogOutput($"FormClosing, Reason {e.CloseReason}");
+                FileSyncApp.Program.keepRunning = false; 
+                Program.autoRestart = false;
+                consoleThread?.Join(10_000);
+                NewLogOutput($"FormClosing, Reason {e.CloseReason}, consoleThread joined");
+            };
 
             FileSyncApp.Program.JobsReady += (s, e) =>
             {

FileSyncAppWin/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using System.Diagnostics;
 using System.IO.Pipes;
 
 namespace FileSyncAppWin
@@ -7,17 +8,19 @@ internal static class Program
     {
 
         private static Mutex mutex = new Mutex(true, "PraewemaFileSyncAppWin");
-        private static volatile bool autoRestart = true;
+        internal static volatile bool autoRestart = true;
         private static ILogger logger;
         private static Form mainForm;
         private const string PipeName = "PraewemaFileSyncAppWinPipe";
+        private static string[] _args;
 
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main(string[] args)
         {
+            _args = args;
             FileSyncApp.Program.ConfigureLogger(args.FirstOrDefault());
             logger = FileSyncApp.Program.LoggerFactory.CreateLogger("FileSyncAppWin");
             if (args.Contains("noautorestart"))
@@ -147,13 +150,17 @@ private static void RestartApplication()
             if (autoRestart)
             {
                 // Get the path of the current application
-                string assemblyPath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+                string assemblyPath = Environment.ProcessPath;
                 // Restart the application using the path
                 logger?.LogInformation("RestartApplication, starting new process {A}", assemblyPath);
-                System.Diagnostics.Process.Start(assemblyPath);
+                ProcessStartInfo processStartInfo = new ProcessStartInfo(assemblyPath);
+                processStartInfo.Arguments = string.Join(' ',_args);
+                processStartInfo.WorkingDirectory = Path.GetDirectoryName(assemblyPath);
+                Process.Start(assemblyPath);
 
                 // Exit the current instance of the application
-                Environment.Exit(0);
+
+                Environment.Exit(-1);
             }
             else
             {