ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Made error handling more robust for managers

Browse source
This commit is contained in:
Ziver Koc 2021-12-04 21:31:48 +01:00
parent b65a9f0bd3
commit b91f006d8b
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hal-core/src/se/hal/HalServer.java
View file

@ -51,6 +51,8 @@ public class HalServer {
// init logging // init logging
LogUtil.readConfiguration("logging.properties"); LogUtil.readConfiguration("logging.properties");
HalAlertManager.initialize();
http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT)); http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT));
http.setDefaultPage(new StartupWebPage()); http.setDefaultPage(new StartupWebPage());
http.start(); http.start();
@ -95,7 +97,6 @@ public class HalServer {
logger.info("Initializing managers."); logger.info("Initializing managers.");
HalAlertManager.initialize();
TriggerManager.initialize(pluginManager); TriggerManager.initialize(pluginManager);
for (Iterator<HalAbstractControllerManager> it = pluginManager.getSingletonIterator(HalAbstractControllerManager.class); it.hasNext(); ) { for (Iterator<HalAbstractControllerManager> 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. * @param daemon registers the given daemon and starts execution of the Runnable.
*/ */
public static void registerDaemon(HalDaemon daemon){ public static void registerDaemon(HalDaemon daemon){
logger.info("Registering daemon: " + daemon.getClass()); try {
daemons.add(daemon); logger.info("Registering daemon: " + daemon.getClass());
daemon.initiate(daemonExecutor); daemons.add(daemon);
daemon.initiate(daemonExecutor);
} catch (Exception e) {
logger.log(Level.SEVERE, "Unable to initialize daemon: " + daemon.getClass(), e);
}
} }

14
hal-core/src/se/hal/daemon/HalExternalWebDaemon.java
View file

@ -121,15 +121,11 @@ public class HalExternalWebDaemon implements HalDaemon {
UserMessageManager.MessageLevel.WARNING, "No SSL certificate is configured for external web-server.", UserMessageManager.MessageTTL.DISMISSED)); UserMessageManager.MessageLevel.WARNING, "No SSL certificate is configured for external web-server.", UserMessageManager.MessageTTL.DISMISSED));
certificate = null; certificate = null;
} }
} catch (Exception e) { } finally {
logger.log(Level.SEVERE, "Unable to request cert from ACME service.", e); // Cleanup
HalAlertManager.getInstance().addAlert(new UserMessageManager.UserMessage( if (tmpHttpServer != null) {
UserMessageManager.MessageLevel.WARNING, "Was unable to generate SSL certificate for external web-server: " + e.getMessage(), UserMessageManager.MessageTTL.DISMISSED)); tmpHttpServer.close();
} }
// Cleanup
if (tmpHttpServer != null) {
tmpHttpServer.close();
} }
} }
} }