X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiRuntimeContext.java;h=2e8c1042ca7d20e21d749fecd7eb418833f9f07b;hb=faeeb8f0ba92b640942d88782ca6f5cfc332597e;hp=c35046b20aec4f0576f272a6e1b4bd11a013418f;hpb=722dc6b20b15014e3d963bd09617ddfd9b63a89f;p=lgpl%2Fargeo-commons.git 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 c35046b20..2e8c1042c 100644 --- a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java +++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java @@ -1,11 +1,12 @@ package org.argeo.init.osgi; import java.io.Serializable; +import java.lang.System.Logger; +import java.lang.System.Logger.Level; import java.lang.System.LoggerFinder; 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; @@ -13,24 +14,33 @@ import java.util.function.Consumer; import java.util.function.Supplier; import org.argeo.api.init.RuntimeContext; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.connect.ConnectFrameworkFactory; import org.osgi.framework.launch.Framework; -import org.osgi.framework.launch.FrameworkFactory; /** An OSGi runtime context. */ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable { + private final static Logger logger = System.getLogger(OsgiRuntimeContext.class.getName()); + + private final static long STOP_FOR_UPDATE_TIMEOUT = 60 * 1000; + private final static long CLOSE_TIMEOUT = 60 * 1000; + + // private final static String SYMBOLIC_NAME_FELIX_SCR = "org.apache.felix.scr"; + + private ConnectFrameworkFactory frameworkFactory; private Map config; private Framework framework; - private OsgiBoot osgiBoot; +// private OsgiBoot osgiBoot; /** * Constructor to use when the runtime context will create the OSGi * {@link Framework}. */ - public OsgiRuntimeContext(Map config) { + public OsgiRuntimeContext(ConnectFrameworkFactory frameworkFactory, Map config) { + this.frameworkFactory = frameworkFactory; this.config = config; } @@ -44,21 +54,29 @@ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable { @Override public void run() { - ServiceLoader sl = ServiceLoader.load(FrameworkFactory.class); - Optional opt = sl.findFirst(); - if (opt.isEmpty()) - throw new IllegalStateException("Cannot find OSGi framework"); - framework = opt.get().newFramework(config); + if (framework != null && framework.getState() >= Framework.STARTING) + throw new IllegalStateException("OSGi framework is already started"); + + if (framework == null) { +// ServiceLoader sl = ServiceLoader.load(FrameworkFactory.class); +// Optional opt = sl.findFirst(); +// if (opt.isEmpty()) +// throw new IllegalStateException("Cannot find OSGi framework"); +// framework = opt.get().newFramework(config); + framework = frameworkFactory.newFramework(config, null); + } + try { framework.start(); BundleContext bundleContext = framework.getBundleContext(); + bundleContext.registerService(ConnectFrameworkFactory.class, frameworkFactory, null); start(bundleContext); } catch (BundleException e) { throw new IllegalStateException("Cannot start OSGi framework", e); } } - public void start(BundleContext bundleContext) { + protected void start(BundleContext bundleContext) { // preferences // SystemRootPreferences systemRootPreferences = ThinPreferencesFactory.getInstance().getSystemRootPreferences(); // bundleContext.registerService(AbstractPreferences.class, systemRootPreferences, new Hashtable<>()); @@ -80,17 +98,53 @@ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable { bundleContext.registerService(Flow.Publisher.class, supplier.get(), new Hashtable<>(Collections.singletonMap(Constants.SERVICE_PID, "argeo.logging.publisher"))); } - osgiBoot = new OsgiBoot(bundleContext); - osgiBoot.bootstrap(config); - + OsgiBoot osgiBoot = new OsgiBoot(bundleContext); + String frameworkUuuid = bundleContext.getProperty(Constants.FRAMEWORK_UUID); + + // separate thread in order to improve logging + Thread osgiBootThread = new Thread("OSGi boot framework " + frameworkUuuid) { + @Override + public void run() { + osgiBoot.bootstrap(); + } + }; + osgiBootThread.start(); + // TODO return a completable stage so that inits can run in parallel +// try { +// osgiBootThread.join(60 * 1000); +// } catch (InterruptedException e) { +// // silent +// } } public void update() { - Objects.requireNonNull(osgiBoot); - osgiBoot.update(); + stop(); + try { + waitForStop(STOP_FOR_UPDATE_TIMEOUT); + } catch (InterruptedException e) { + logger.log(Level.TRACE, "Wait for stop interrupted", e); + } + run(); + + // TODO Optimise with OSGi mechanisms (e.g. framework.update()) +// if (osgiBoot != null) { +// Objects.requireNonNull(osgiBoot); +// osgiBoot.update(); +// } + } + + protected void stop() { + if (framework == null) + return; + stop(framework.getBundleContext()); + try { + framework.stop(); + } catch (BundleException e) { + throw new IllegalStateException("Cannot stop OSGi framework", e); + } } - public void stop(BundleContext bundleContext) { + protected void stop(BundleContext bundleContext) { // if (loggingConfigurationSr != null) // try { // loggingConfigurationSr.unregister(); @@ -108,30 +162,55 @@ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable { @Override public void waitForStop(long timeout) throws InterruptedException { if (framework == null) - throw new IllegalStateException("Framework is not initialised"); + return; framework.waitForStop(timeout); } public void close() throws Exception { + if (framework == null) + return; // 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(); +// for (Bundle scrBundle : framework.getBundleContext().getBundles()) { +// if (scrBundle.getSymbolicName().equals(SYMBOLIC_NAME_FELIX_SCR)) { +// if (scrBundle.getState() > Bundle.RESOLVED) { +// scrBundle.stop(); +// while (!(scrBundle.getState() <= Bundle.RESOLVED)) { +// Thread.sleep(100); +// } +// Thread.sleep(500); +// } +// } +// } + stop(); + waitForStop(CLOSE_TIMEOUT); + framework = null; +// osgiBoot = null; + config.clear(); } public Framework getFramework() { return framework; } + /** + * Load {@link ConnectFrameworkFactory} from Java service loader. This will not + * work within a pure OSGi runtime, so the reference should be passed to child + * runtimes as an OSGi service. + */ + public static ConnectFrameworkFactory loadFrameworkFactory() { + ServiceLoader sl = ServiceLoader.load(ConnectFrameworkFactory.class); + Optional opt = sl.findFirst(); + if (opt.isEmpty()) + throw new IllegalStateException("Cannot find OSGi framework factory"); + return opt.get(); + } + + public static ConnectFrameworkFactory getFrameworkFactory(BundleContext bundleContext) { + ServiceReference sr = bundleContext.getServiceReference(ConnectFrameworkFactory.class); + if (sr == null) + return null; + return bundleContext.getService(sr); + } }