diff --git a/hal-core/src/se/hal/HalServer.java b/hal-core/src/se/hal/HalServer.java index 110d22f6..0b9fc731 100644 --- a/hal-core/src/se/hal/HalServer.java +++ b/hal-core/src/se/hal/HalServer.java @@ -51,6 +51,8 @@ public class HalServer { // init logging LogUtil.readConfiguration("logging.properties"); + HalAlertManager.initialize(); + http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT)); http.setDefaultPage(new StartupWebPage()); http.start(); @@ -95,7 +97,6 @@ public class HalServer { logger.info("Initializing managers."); - HalAlertManager.initialize(); TriggerManager.initialize(pluginManager); for (Iterator it = pluginManager.getSingletonIterator(HalAbstractControllerManager.class); it.hasNext(); ) { @@ -175,9 +176,13 @@ public class HalServer { * @param daemon registers the given daemon and starts execution of the Runnable. */ public static void registerDaemon(HalDaemon daemon){ - logger.info("Registering daemon: " + daemon.getClass()); - daemons.add(daemon); - daemon.initiate(daemonExecutor); + try { + logger.info("Registering daemon: " + daemon.getClass()); + daemons.add(daemon); + daemon.initiate(daemonExecutor); + } catch (Exception e) { + logger.log(Level.SEVERE, "Unable to initialize daemon: " + daemon.getClass(), e); + } } diff --git a/hal-core/src/se/hal/daemon/HalExternalWebDaemon.java b/hal-core/src/se/hal/daemon/HalExternalWebDaemon.java index 0fe085b2..9b4b978b 100644 --- a/hal-core/src/se/hal/daemon/HalExternalWebDaemon.java +++ b/hal-core/src/se/hal/daemon/HalExternalWebDaemon.java @@ -121,15 +121,11 @@ public class HalExternalWebDaemon implements HalDaemon { UserMessageManager.MessageLevel.WARNING, "No SSL certificate is configured for external web-server.", UserMessageManager.MessageTTL.DISMISSED)); certificate = null; } - } catch (Exception e) { - logger.log(Level.SEVERE, "Unable to request cert from ACME service.", e); - HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage( - UserMessageManager.MessageLevel.WARNING, "Was unable to generate SSL certificate for external web-server: " + e.getMessage(), UserMessageManager.MessageTTL.DISMISSED)); - } - - // Cleanup - if (tmpHttpServer != null) { - tmpHttpServer.close(); + } finally { + // Cleanup + if (tmpHttpServer != null) { + tmpHttpServer.close(); + } } } }