X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FCmsActivator.java;h=038d7029ca9cf6b720c1b8c01ef85e95384c32aa;hb=6862cee138ca8ed2bbf6427b20b389a56b5df32f;hp=d28ffdbb225e937e26b904e2bbdc5da788d7017d;hpb=f4da6777015da3fc392138f0c01cea2f2add9ed3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
index d28ffdbb2..038d7029c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
@@ -35,7 +35,7 @@ public class CmsActivator implements BundleActivator {
 
 	private LogReaderService logReaderService;
 
-	private NodeLogger logger;
+	private CmsOsgiLogger logger;
 //	private CmsStateImpl nodeState;
 //	private CmsDeploymentImpl nodeDeployment;
 //	private CmsContextImpl nodeInstance;
@@ -55,6 +55,7 @@ public class CmsActivator implements BundleActivator {
 //		this.bc = bundleContext;
 		if (bundleContext != null)
 			this.logReaderService = getService(LogReaderService.class);
+		initArgeoLogger();
 //		this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 //
 //		try {
@@ -89,6 +90,8 @@ public class CmsActivator implements BundleActivator {
 		} catch (Exception e) {
 			log.error("CMS activator shutdown failed", e);
 		}
+		
+		new GogoShellKiller().start();
 	}
 
 	private void initSecurity() {
@@ -128,7 +131,7 @@ public class CmsActivator implements BundleActivator {
 	}
 
 	private void initArgeoLogger() {
-		logger = new NodeLogger(logReaderService);
+		logger = new CmsOsgiLogger(logReaderService);
 		if (bundleContext != null)
 			bundleContext.registerService(ArgeoLogger.class, logger, null);
 	}