X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=951b54fc2b4b5b9e0ef58bf9f93afed6e61aa054;hp=91fb5475993256d94a2c15733abe76499184799f;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hpb=dbb47149d5e2c1e67ec9889587ff24dd7c622862

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 91fb547..951b54f 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -68,22 +68,22 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				Class<?> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
 				int recordLevel = logRecord.getLevel().intValue();
 				if (recordLevel < Level.FINE.intValue()) {
-					freenet.support.Logger.debug(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.debug(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.INFO.intValue()) {
-					freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.minor(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.WARNING.intValue()) {
-					freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.normal(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.SEVERE.intValue()) {
-					freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.warning(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else {
-					freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.error(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				}
 			}
 		});
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 6, 7);
+	public static final Version VERSION = new Version(0, 8);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -103,6 +103,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
+	/** The web of trust connector. */
+	private WebOfTrustConnector webOfTrustConnector;
+
 	/** The identity manager. */
 	private IdentityManager identityManager;
 
@@ -145,7 +148,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void runPlugin(@SuppressWarnings("hiding") PluginRespirator pluginRespirator) {
+	public void runPlugin(PluginRespirator pluginRespirator) {
 		this.pluginRespirator = pluginRespirator;
 
 		/* create a configuration. */
@@ -181,7 +184,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* create web of trust connector. */
 			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-			WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+			webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
 			identityManager = new IdentityManager(webOfTrustConnector);
 			identityManager.setContext("Sone");
 
@@ -236,6 +239,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* stop the identity manager. */
 			identityManager.stop();
+
+			/* stop the web of trust connector. */
+			webOfTrustConnector.stop();
 		} catch (Throwable t1) {
 			logger.log(Level.SEVERE, "Error while shutting down!", t1);
 		} finally {