Make sure exitcode is set

NethermindEth · Jun 28, 2022 · 06c26a6 · 06c26a6
1 parent 919f908
commit 06c26a6
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Nethermind/Nethermind.Runner/Program.cs b/src/Nethermind/Nethermind.Runner/Program.cs
@@ -131,7 +131,6 @@ private static void Run(string[] args)
 
             app.OnExecute(async () =>
             {
-                _appClosed.Reset();
                 IConfigProvider configProvider = BuildConfigProvider(app, loggerConfigSource, logLevelOverride, configsDirectory, configFile);
                 IInitConfig initConfig = configProvider.GetConfig<IInitConfig>();
                 IKeyStoreConfig keyStoreConfig = configProvider.GetConfig<IKeyStoreConfig>();
@@ -175,6 +174,7 @@ private static void Run(string[] args)
                 INethermindApi nethermindApi = apiBuilder.Create(plugins.OfType<IConsensusPlugin>());
                 ((List<INethermindPlugin>)nethermindApi.Plugins).AddRange(plugins);
 
+                _appClosed.Reset();
                 EthereumRunner ethereumRunner = new(nethermindApi);
                 bool runFailed = false;
                 try
@@ -202,8 +202,19 @@ private static void Run(string[] args)
                 return 0;
             });
 
-            _ = app.Execute(args);
-            _appClosed.Wait();
+            try
+            {
+                Environment.ExitCode = app.Execute(args);
+            }
+            catch (Exception)
+            {
+                Environment.ExitCode = -1;
+                throw;
+            }
+            finally
+            {
+                _appClosed.Wait();
+            }
         }
 
         private static void BuildOptionsFromConfigFiles(CommandLineApplication app)