From 344dfc1d20780c3453a07f5573259ccdc76f6160 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 24 Feb 2018 12:59:46 +0100 Subject: [PATCH] Improve error logging in CMS Activator --- .../org/argeo/cms/internal/kernel/Activator.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java index 980dde975..5ba7c01e8 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java @@ -37,9 +37,7 @@ public class Activator implements BundleActivator { private static Activator instance; private BundleContext bc; - // private CmsSecurity nodeSecurity; private LogReaderService logReaderService; - // private ConfigurationAdmin configurationAdmin; private NodeLogger logger; private CmsState nodeState; @@ -52,15 +50,13 @@ public class Activator implements BundleActivator { instance = this; this.bc = bundleContext; this.logReaderService = getService(LogReaderService.class); - // this.configurationAdmin = getService(ConfigurationAdmin.class); try { - // nodeSecurity = new CmsSecurity(); initSecurity(); initArgeoLogger(); initNode(); log.debug("Kernel bundle started"); - } catch (Exception e) { + } catch (Throwable e) { log.error("## FATAL: CMS activator failed", e); } } @@ -93,16 +89,6 @@ public class Activator implements BundleActivator { } private void initArgeoLogger() { - // Jetty - // disable integration of Jetty logging with SLF4J - // in order to avoid chicken and egg problems - // org.eclipse.jetty.util.log.Log.setLog(new StdErrLog()); - // org.eclipse.jetty.util.log.Logger jettyLog = - // org.eclipse.jetty.util.log.Log.getLog(); - // if (jettyLog != null) { - // jettyLog.warn("TEST JETTY LOG", new Object[0]); - // } - logger = new NodeLogger(logReaderService); bc.registerService(ArgeoLogger.class, logger, null); } -- 2.30.2