Merge pull request #880 from solidify/feature/return-code-2

Ensure return code is returned from the application. Use error code -1
solidify · Oct 9, 2023 · 1c02aa1 · 1c02aa1
2 parents e40f162 + 2b9defc
commit 1c02aa1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/WorkItemMigrator/JiraExport/JiraCommandLine.cs b/src/WorkItemMigrator/JiraExport/JiraCommandLine.cs
@@ -59,7 +59,7 @@ private void ConfigureCommandLineParserWithOptions()
                     commandLineApplication.ShowHelp();
                 }
 
-                return succeeded ? 0 : 1;
+                return succeeded ? 0 : -1;
             });
         }
 
@@ -267,9 +267,9 @@ private static void EndSession(int itemsCount, Stopwatch sw)
                     { "elapsed-time", string.Format("{0:hh\\:mm\\:ss}", sw.Elapsed) }});
         }
 
-        public void Run()
+        public int Run()
         {
-            commandLineApplication.Execute(args);
+            return commandLineApplication.Execute(args);
         }
     }
 }
diff --git a/src/WorkItemMigrator/JiraExport/Program.cs b/src/WorkItemMigrator/JiraExport/Program.cs
@@ -5,18 +5,19 @@ namespace JiraExport
 {
     static class Program
     {
-        static void Main(string[] args)
+        static int Main(string[] args)
         {
             VersionInfo.PrintInfoMessage("Jira Exporter");
 
             try
             {
                 var cmd = new JiraCommandLine(args);
-                cmd.Run();
+                return cmd.Run();
             }
             catch (Exception ex)
             {
                 Logger.Log(ex, "Application stopped due to an unexpected exception", LogLevel.Critical);
+                return -1;
             }
         }
     }

diff --git a/src/WorkItemMigrator/WorkItemImport/ImportCommandLine.cs b/src/WorkItemMigrator/WorkItemImport/ImportCommandLine.cs
@@ -24,9 +24,9 @@ public ImportCommandLine(params string[] args)
             InitCommandLine(args);
         }
 
-        public void Run()
+        public int Run()
         {
-            commandLineApplication.Execute(args);
+            return commandLineApplication.Execute(args);
         }
 
         private void InitCommandLine(params string[] args)
@@ -61,7 +61,7 @@ private void ConfigureCommandLineParserWithOptions()
                     commandLineApplication.ShowHelp();
                 }
 
-                return succeeded ? 0 : 1;
+                return succeeded ? 0 : -1;
             });
         }
 

diff --git a/src/WorkItemMigrator/WorkItemImport/Program.cs b/src/WorkItemMigrator/WorkItemImport/Program.cs
@@ -13,11 +13,12 @@ static void Main(string[] args)
             try
             {
                 var cmd = new ImportCommandLine(args);
-                cmd.Run();
+                return cmd.Run();
             }
             catch (Exception ex)
             {
                 Logger.Log(ex, "Application stopped due to an unexpected exception", LogLevel.Critical);
+                return -1;
             }
         }
     }