X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=810fef1164211512f7c9bda34cc6f7eda51b5f15;hb=554a8f521027da73bd6519f3480b1ed70b108903;hp=8af45c6c9befd68a7aef08a948ff9a4d011ae694;hpb=db5fa52470a5bbc5ec73d49469a8a775cefd944a;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 8af45c6..810fef1 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -31,6 +31,7 @@ import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.config.MapConfigurationBackend;
 import net.pterodactylus.util.config.XMLConfigurationBackend;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.version.Version;
 import freenet.client.async.DatabaseDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
@@ -38,7 +39,9 @@ import freenet.pluginmanager.FredPlugin;
 import freenet.pluginmanager.FredPluginBaseL10n;
 import freenet.pluginmanager.FredPluginL10n;
 import freenet.pluginmanager.FredPluginThreadless;
+import freenet.pluginmanager.FredPluginVersioned;
 import freenet.pluginmanager.PluginRespirator;
+import freenet.pluginmanager.PluginStore;
 
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
@@ -46,13 +49,16 @@ import freenet.pluginmanager.PluginRespirator;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless {
+public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
 
 	static {
 		/* initialize logging. */
 		Logging.setup("sone");
 	}
 
+	/** The version. */
+	private static final Version VERSION = new Version("SNAPSHOT", 0, 1);
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
 
@@ -62,9 +68,15 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	/** The core. */
 	private Core core;
 
+	/** The web interface. */
+	private WebInterface webInterface;
+
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
+	/** The plugin store. */
+	private PluginStore pluginStore;
+
 	//
 	// ACCESSORS
 	//
@@ -110,7 +122,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		/* create a configuration. */
 		Configuration configuration;
 		try {
-			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator.getStore()));
+			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginStore = pluginRespirator.getStore()));
 		} catch (DatabaseDisabledException dde1) {
 			logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
 			try {
@@ -125,7 +137,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
 
 		/* create the web interface. */
-		WebInterface webInterface = new WebInterface(this);
+		webInterface = new WebInterface(this);
 
 		/* create core. */
 		core = new Core();
@@ -133,8 +145,21 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		core.freenetInterface(freenetInterface);
 
 		/* start core! */
-		core.start();
-		webInterface.start();
+		boolean startupFailed = true;
+		try {
+			core.start();
+			webInterface.start();
+			startupFailed = false;
+		} finally {
+			if (startupFailed) {
+				/*
+				 * we let the exception bubble up but shut the logging down so
+				 * that the logfile is not swamped by the installed logging
+				 * handlers of the failed instances.
+				 */
+				Logging.shutdown();
+			}
+		}
 	}
 
 	/**
@@ -142,10 +167,21 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	 */
 	@Override
 	public void terminate() {
+		/* stop the web interface. */
+		webInterface.stop();
+
 		/* stop the core. */
 		core.stop();
 
 		/* TODO wait for core to stop? */
+		try {
+			pluginRespirator.putStore(pluginStore);
+		} catch (DatabaseDisabledException dde1) {
+			logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
+		}
+
+		/* shutdown logger. */
+		Logging.shutdown();
 	}
 
 	//
@@ -204,4 +240,16 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		return SonePlugin.class.getClassLoader();
 	}
 
+	//
+	// INTERFACE FredPluginVersioned
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getVersion() {
+		return VERSION.toString();
+	}
+
 }