X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=a0a22f9be7ab0ffd4660c5fbb69db1cdf9b458db;hb=9614c2e0fb482c1e628061c26cccdeea2c0b68aa;hp=1f2622cdd8bfb590c284aba4c52d54ee880dd70b;hpb=b5dc5b02b9b91700b8a7a84bc2991b35968b9f6f;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 1f2622c..a0a22f9 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 4);
+	public static final Version VERSION = new Version(0, 3, 7);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -166,28 +166,28 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 			}
 		}
 
-		/* create freenet interface. */
-		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+		boolean startupFailed = true;
+		try {
+			/* create freenet interface. */
+			FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
 
-		/* create web of trust connector. */
-		PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-		WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
-		identityManager = new IdentityManager(webOfTrustConnector);
-		identityManager.setContext("Sone");
+			/* create web of trust connector. */
+			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+			WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+			identityManager = new IdentityManager(webOfTrustConnector);
+			identityManager.setContext("Sone");
 
-		/* create core. */
-		core = new Core(oldConfiguration, freenetInterface, identityManager);
+			/* create core. */
+			core = new Core(oldConfiguration, freenetInterface, identityManager);
 
-		/* create the web interface. */
-		webInterface = new WebInterface(this);
-		core.addCoreListener(webInterface);
+			/* create the web interface. */
+			webInterface = new WebInterface(this);
+			core.addCoreListener(webInterface);
 
-		/* create the identity manager. */
-		identityManager.addIdentityListener(core);
+			/* create the identity manager. */
+			identityManager.addIdentityListener(core);
 
-		/* start core! */
-		boolean startupFailed = true;
-		try {
+			/* start core! */
 			core.start();
 			if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
 				logger.log(Level.INFO, "Setting configuration to file-based configuration.");
@@ -224,6 +224,8 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 
 			/* stop the identity manager. */
 			identityManager.stop();
+		} catch (Throwable t1) {
+			logger.log(Level.SEVERE, "Error while shutting down!", t1);
 		} finally {
 			/* shutdown logger. */
 			Logging.shutdown();