improve error handling

christiankiller · Oct 3, 2020 · d59dab8 · d59dab8
1 parent 29aef32
commit d59dab8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/main/java/horse/wtf/nzyme/Main.java b/src/main/java/horse/wtf/nzyme/Main.java
@@ -104,7 +104,13 @@ public static void main(String[] argv) {
                 }
 
                 NzymeLeader nzyme = new NzymeLeaderImpl(baseConfiguration, leaderConfiguration, database);
-                nzyme.initialize();
+
+                try {
+                    nzyme.initialize();
+                } catch(Exception e) {
+                    LOG.fatal("Could not initialize nzyme.", e);
+                    System.exit(FAILURE);
+                }
 
                 Runtime.getRuntime().addShutdownHook(new Thread(() -> {
                     Thread.currentThread().setName("shutdown-hook");
@@ -127,7 +133,12 @@ public static void main(String[] argv) {
                 }
 
                 NzymeTracker tracker = new NzymeTrackerImpl(baseConfiguration, trackerConfiguration);
-                tracker.initialize();
+                try {
+                    tracker.initialize();
+                } catch (Exception e) {
+                    LOG.fatal("Could not initialize nzyme.", e);
+                    System.exit(FAILURE);
+                }
         }
 
         while(true) {

diff --git a/src/main/java/horse/wtf/nzyme/NzymeLeaderImpl.java b/src/main/java/horse/wtf/nzyme/NzymeLeaderImpl.java
@@ -263,8 +263,8 @@ public void initialize() {
         // Register web interface asset resources.
         resourceConfig.register(WebInterfaceAssetsResource.class);
 
-        if(configuration.useTls()) {
-            try {
+        try {
+            if (configuration.useTls()) {
                 httpServer = GrizzlyHttpServerFactory.createHttpServer(
                         configuration.restListenUri(),
                         resourceConfig,
@@ -274,11 +274,11 @@ public void initialize() {
                                 configuration.tlsKeyPath()
                         )
                 );
-            } catch (GeneralSecurityException | IOException e) {
-                throw new RuntimeException("Could not initialize secure web server.", e);
+            } else {
+                httpServer = GrizzlyHttpServerFactory.createHttpServer(configuration.restListenUri(), resourceConfig);
             }
-        } else {
-            httpServer = GrizzlyHttpServerFactory.createHttpServer(configuration.restListenUri(), resourceConfig);
+        } catch(Exception e) {
+            throw new RuntimeException("Could not start web server.", e);
         }
 
         LOG.info("Started web interface and REST API at [{}]. Access it at: [{}]",