Improve Argeo Init shutdown sequence.

[lgpl/argeo-commons.git] / org.argeo.init / src / org / argeo / init / osgi / OsgiRuntimeContext.java

diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
index 91756e32b6759921484c0c1bf6b937408ccd4ab7..373e3d6719115030884a2ed770b7dbf6667724d9 100644 (file)
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
@@ -1,24 +1,43 @@
 package org.argeo.init.osgi;
 
+import java.util.Collections;
+import java.util.Hashtable;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.concurrent.Flow;
+import java.util.function.Consumer;
 
 import org.argeo.init.RuntimeContext;
+import org.argeo.init.logging.ThinLoggerFinder;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
 
+/** An OSGi runtime context. */
 public class OsgiRuntimeContext implements RuntimeContext {
        private Map<String, String> config;
        private Framework framework;
        private OsgiBoot osgiBoot;
 
+       @SuppressWarnings("rawtypes")
+       private ServiceRegistration<Consumer> loggingConfigurationSr;
+       @SuppressWarnings("rawtypes")
+       private ServiceRegistration<Flow.Publisher> logEntryPublisherSr;
+
        public OsgiRuntimeContext(Map<String, String> config) {
                this.config = config;
        }
 
+       public OsgiRuntimeContext(BundleContext bundleContext) {
+               start(bundleContext);
+       }
+
        @Override
        public void run() {
                ServiceLoader<FrameworkFactory> sl = ServiceLoader.load(FrameworkFactory.class);
@@ -29,24 +48,69 @@ public class OsgiRuntimeContext implements RuntimeContext {
                try {
                        framework.start();
                        BundleContext bundleContext = framework.getBundleContext();
-                       osgiBoot = new OsgiBoot(bundleContext);
-                       osgiBoot.bootstrap();
+                       start(bundleContext);
                } catch (BundleException e) {
                        throw new IllegalStateException("Cannot start OSGi framework", e);
                }
        }
 
+       public void start(BundleContext bundleContext) {
+               // logging
+               loggingConfigurationSr = bundleContext.registerService(Consumer.class,
+                               ThinLoggerFinder.getConfigurationConsumer(),
+                               new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.configuration")));
+               logEntryPublisherSr = bundleContext.registerService(Flow.Publisher.class,
+                               ThinLoggerFinder.getLogEntryPublisher(),
+                               new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.publisher")));
+
+               osgiBoot = new OsgiBoot(bundleContext);
+               osgiBoot.bootstrap();
+
+       }
+
+       public void update() {
+               Objects.requireNonNull(osgiBoot);
+               osgiBoot.update();
+       }
+
+       public void stop(BundleContext bundleContext) {
+//             if (loggingConfigurationSr != null)
+//                     try {
+//                             loggingConfigurationSr.unregister();
+//                     } catch (Exception e) {
+//                             // silent
+//                     }
+//             if (logEntryPublisherSr != null)
+//                     try {
+//                             logEntryPublisherSr.unregister();
+//                     } catch (Exception e) {
+//                             // silent
+//                     }
+       }
+
        @Override
        public void waitForStop(long timeout) throws InterruptedException {
                if (framework == null)
                        throw new IllegalStateException("Framework is not initialised");
+
                framework.waitForStop(timeout);
        }
 
-       @Override
        public void close() throws Exception {
+               // TODO make shutdown of dynamic service more robust
+               Bundle scrBundle = osgiBoot.getBundlesBySymbolicName().get("org.apache.felix.scr");
+               if (scrBundle != null) {
+                       scrBundle.stop();
+                       while (!(scrBundle.getState() <= Bundle.RESOLVED)) {
+                               Thread.sleep(500);
+                       }
+                       Thread.sleep(1000);
+               }
+
+               stop(framework.getBundleContext());
                if (framework != null)
                        framework.stop();
+
        }
 
 }