X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=701858d654dc00497fe0a320800b6c1a547ad537;hb=08588302c5ad1665e9a49b9acaff83e88365acbd;hp=17340b8dde6312ad9fbaf159bdd644fc4ae65fe0;hpb=32998f6979928e57b9b7a4eac4dabe668a821471;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 17340b8..701858d 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -45,7 +45,6 @@ import com.google.common.eventbus.EventBus;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;
 import com.google.inject.spi.InjectionListener;
@@ -75,9 +74,10 @@ import freenet.support.api.Bucket;
  */
 public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
 
+	private static final Logger soneLogger = getLogger("net.pterodactylus.sone");
+
 	static {
 		/* initialize logging. */
-		Logger soneLogger = getLogger("net.pterodactylus.sone");
 		soneLogger.setUseParentHandlers(false);
 		soneLogger.addHandler(new Handler() {
 			private final LoadingCache<String, Class<?>> classCache = CacheBuilder.newBuilder()
@@ -87,7 +87,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 							return Class.forName(key);
 						}
 					});
-			
+
 			@Override
 			public void publish(LogRecord logRecord) {
 				int recordLevel = logRecord.getLevel().intValue();
@@ -116,7 +116,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 9, 2);
+	public static final Version VERSION = new Version(0, 9, 3);
 
 	/** The current year at time of release. */
 	private static final int YEAR = 2015;
@@ -295,6 +295,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 */
 	@Override
 	public void terminate() {
+		deregisterLoggerHandlers();
 		try {
 			/* stop the web interface. */
 			webInterface.stop();
@@ -309,6 +310,12 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		}
 	}
 
+	private void deregisterLoggerHandlers() {
+		for (Handler handler : soneLogger.getHandlers()) {
+			soneLogger.removeHandler(handler);
+		}
+	}
+
 	//
 	// INTERFACE FredPluginFCP
 	//