Merge pull request #4843 from chimp1984/add-delay-to-exit

Add 1 sec delay before calling exit
bisq-network · Nov 24, 2020 · f054e92 · f054e92
2 parents 94453cf + 788e025
commit f054e92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -250,10 +250,10 @@ public void gracefulShutDown(ResultHandler resultHandler) {
                             PersistenceManager.flushAllDataToDisk(() -> {
                                 log.info("Graceful shutdown completed. Exiting now.");
                                 resultHandler.handleResult();
-                                System.exit(EXIT_SUCCESS);
+                                UserThread.runAfter(() -> System.exit(EXIT_SUCCESS), 1);
                             });
                         } else {
-                            System.exit(EXIT_SUCCESS);
+                            UserThread.runAfter(() -> System.exit(EXIT_SUCCESS), 1);
                         }
                     });
                 });
@@ -269,10 +269,10 @@ public void gracefulShutDown(ResultHandler resultHandler) {
                     PersistenceManager.flushAllDataToDisk(() -> {
                         log.info("Graceful shutdown resulted in a timeout. Exiting now.");
                         resultHandler.handleResult();
-                        System.exit(EXIT_SUCCESS);
+                        UserThread.runAfter(() -> System.exit(EXIT_SUCCESS), 1);
                     });
                 } else {
-                    System.exit(EXIT_SUCCESS);
+                    UserThread.runAfter(() -> System.exit(EXIT_SUCCESS), 1);
                 }
 
             }, 20);
@@ -284,10 +284,10 @@ public void gracefulShutDown(ResultHandler resultHandler) {
                 PersistenceManager.flushAllDataToDisk(() -> {
                     log.info("Graceful shutdown resulted in an error. Exiting now.");
                     resultHandler.handleResult();
-                    System.exit(EXIT_FAILURE);
+                    UserThread.runAfter(() -> System.exit(EXIT_FAILURE), 1);
                 });
             } else {
-                System.exit(EXIT_FAILURE);
+                UserThread.runAfter(() -> System.exit(EXIT_FAILURE), 1);
             }
         }
     }

diff --git a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java b/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java
@@ -95,7 +95,7 @@ public void gracefulShutDown(ResultHandler resultHandler) {
                         PersistenceManager.flushAllDataToDisk(() -> {
                             resultHandler.handleResult();
                             log.info("Graceful shutdown completed. Exiting now.");
-                            System.exit(BisqExecutable.EXIT_SUCCESS);
+                            UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_SUCCESS), 1);
                         });
                     });
                     injector.getInstance(WalletsSetup.class).shutDown();
@@ -107,7 +107,7 @@ public void gracefulShutDown(ResultHandler resultHandler) {
                     PersistenceManager.flushAllDataToDisk(() -> {
                         resultHandler.handleResult();
                         log.info("Graceful shutdown caused a timeout. Exiting now.");
-                        System.exit(BisqExecutable.EXIT_SUCCESS);
+                        UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_SUCCESS), 1);
                     });
                 }, 5);
             } else {
@@ -122,7 +122,7 @@ public void gracefulShutDown(ResultHandler resultHandler) {
             PersistenceManager.flushAllDataToDisk(() -> {
                 resultHandler.handleResult();
                 log.info("Graceful shutdown resulted in an error. Exiting now.");
-                System.exit(BisqExecutable.EXIT_FAILURE);
+                UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_FAILURE), 1);
             });
 
         }