package org.argeo.init;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.TreeMap;
+import org.argeo.init.logging.ThinLoggerFinder;
+import org.argeo.init.osgi.OsgiBoot;
import org.argeo.init.osgi.OsgiRuntimeContext;
/** Configure and launch an Argeo service. */
-public class Service implements Runnable, AutoCloseable {
- private final static Logger log = System.getLogger(Service.class.getName());
+public class Service {
+ private final static Logger logger = System.getLogger(Service.class.getName());
- private static RuntimeContext runtimeContext = null;
+ final static String FILE_SYSTEM_PROPERTIES = "system.properties";
- protected Service(String[] args) {
- }
+ public final static String PROP_ARGEO_INIT_MAIN = "argeo.init.main";
- @Override
- public void run() {
- }
+ private static RuntimeContext runtimeContext = null;
+
+ private static List<Runnable> postStart = Collections.synchronizedList(new ArrayList<>());
- @Override
- public void close() throws Exception {
+ protected Service(String[] args) {
}
public static void main(String[] args) {
- long pid = ProcessHandle.current().pid();
- log.log(Logger.Level.DEBUG, "Argeo Init starting with PID " + pid);
+ final long pid = ProcessHandle.current().pid();
+ logger.log(Logger.Level.DEBUG, () -> "Argeo Init starting with PID " + pid);
// shutdown on exit
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
}
} catch (Exception e) {
e.printStackTrace();
- System.exit(1);
+ Runtime.getRuntime().halt(1);
}
}, "Runtime shutdown"));
+ // TODO use args as well
+ String dataArea = System.getProperty(OsgiBoot.PROP_OSGI_INSTANCE_AREA);
+ String stateArea = System.getProperty(OsgiBoot.PROP_OSGI_CONFIGURATION_AREA);
+ String configArea = System.getProperty(OsgiBoot.PROP_OSGI_SHARED_CONFIGURATION_AREA);
+
+ if (configArea != null) {
+ Path configAreaPath = Paths.get(configArea);
+ Path additionalSystemPropertiesPath = configAreaPath.resolve(FILE_SYSTEM_PROPERTIES);
+ if (Files.exists(additionalSystemPropertiesPath)) {
+ Properties properties = new Properties();
+ try (InputStream in = Files.newInputStream(additionalSystemPropertiesPath)) {
+ properties.load(in);
+ } catch (IOException e) {
+ logger.log(Logger.Level.ERROR,
+ "Cannot load additional system properties " + additionalSystemPropertiesPath, e);
+ }
+
+ for (Object key : properties.keySet()) {
+ String currentValue = System.getProperty(key.toString());
+ String value = properties.getProperty(key.toString());
+ if (currentValue != null) {
+ if (!Objects.equals(value, currentValue))
+ logger.log(Logger.Level.WARNING, "System property " + key + " already set with value "
+ + currentValue + " instead of " + value + ". Ignoring new value.");
+ } else {
+ System.setProperty(key.toString(), value);
+ logger.log(Logger.Level.TRACE, () -> "Added " + key + "=" + value
+ + " to system properties, from " + additionalSystemPropertiesPath.getFileName());
+ }
+ }
+ ThinLoggerFinder.reloadConfiguration();
+ }
+ }
+
Map<String, String> config = new HashMap<>();
- config.put("osgi.framework.useSystemProperties", "true");
-// for (Object key : System.getProperties().keySet()) {
-// config.put(key.toString(), System.getProperty(key.toString()));
-// log.log(Logger.Level.DEBUG, key + "=" + System.getProperty(key.toString()));
-// }
+ config.put(PROP_ARGEO_INIT_MAIN, "true");
+
+ // add OSGi system properties to the configuration
+ sysprops: for (Object key : new TreeMap<>(System.getProperties()).keySet()) {
+ String keyStr = key.toString();
+ switch (keyStr) {
+ case OsgiBoot.PROP_OSGI_CONFIGURATION_AREA:
+ case OsgiBoot.PROP_OSGI_SHARED_CONFIGURATION_AREA:
+ case OsgiBoot.PROP_OSGI_INSTANCE_AREA:
+ // we should already have dealt with those
+ continue sysprops;
+ default:
+ }
+
+ if (keyStr.startsWith("osgi.") || keyStr.startsWith("org.osgi.") || keyStr.startsWith("eclipse.")
+ || keyStr.startsWith("org.eclipse.equinox.") || keyStr.startsWith("felix.")) {
+ String value = System.getProperty(keyStr);
+ config.put(keyStr, value);
+ logger.log(Logger.Level.TRACE,
+ () -> "Added " + key + "=" + value + " to configuration, from system properties");
+ }
+ }
+
try {
try {
- OsgiRuntimeContext osgiRuntimeContext = new OsgiRuntimeContext((Map<String, String>) config);
+ if (stateArea != null)
+ config.put(OsgiBoot.PROP_OSGI_CONFIGURATION_AREA, stateArea);
+ if (configArea != null)
+ config.put(OsgiBoot.PROP_OSGI_SHARED_CONFIGURATION_AREA, configArea);
+ if (dataArea != null)
+ config.put(OsgiBoot.PROP_OSGI_INSTANCE_AREA, dataArea);
+ // config.put(OsgiBoot.PROP_OSGI_USE_SYSTEM_PROPERTIES, "true");
+
+ OsgiRuntimeContext osgiRuntimeContext = new OsgiRuntimeContext(config);
osgiRuntimeContext.run();
Service.runtimeContext = osgiRuntimeContext;
+ for (Runnable run : postStart) {
+ try {
+ run.run();
+ } catch (Exception e) {
+ logger.log(Level.ERROR, "Cannot run post start callback " + run, e);
+ }
+ }
Service.runtimeContext.waitForStop(0);
- } catch (NoClassDefFoundError e) {
+ } catch (NoClassDefFoundError noClassDefFoundE) {
StaticRuntimeContext staticRuntimeContext = new StaticRuntimeContext((Map<String, String>) config);
staticRuntimeContext.run();
Service.runtimeContext = staticRuntimeContext;
+ for (Runnable run : postStart) {
+ try {
+ run.run();
+ } catch (Exception e) {
+ logger.log(Level.ERROR, "Cannot run post start callback " + run, e);
+ }
+ }
Service.runtimeContext.waitForStop(0);
}
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
}
- log.log(Logger.Level.DEBUG, "Argeo Init stopped with PID " + pid);
+ logger.log(Logger.Level.DEBUG, "Argeo Init stopped with PID " + pid);
}
-
+ /** The root runtime context in this JVM. */
public static RuntimeContext getRuntimeContext() {
return runtimeContext;
}
+
+ /** Add a post-start call back to be run after the runtime has been started. */
+ public static void addPostStart(Runnable runnable) {
+ postStart.add(runnable);
+ }
}
projects / lgpl / argeo-commons.git / blobdiff