X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=cbdca3485c2f8c649b1c13ae32b4a56fe02fe0d4;hb=e5842243d4aced0929329e0cbaf0656e73887d72;hp=1df4a33dc413c5e6efe1f15b47a9e7b5013fd5d2;hpb=66f7a05968c9e8c094e5a329ec36363a6bfb839f;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 1df4a33..cbdca34 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -250,6 +250,12 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				bind(Context.class).toInstance(context);
 				bind(getOptionalContextTypeLiteral()).toInstance(of(context));
 				bind(SonePlugin.class).toInstance(SonePlugin.this);
+				if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
+					String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
+					if (path != null) {
+						bind(Loaders.class).toInstance(new DebugLoaders(path));
+					}
+				}
 				bindListener(Matchers.any(), new TypeListener() {
 
 					@Override
@@ -295,7 +301,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 */
 	@Override
 	public void terminate() {
-		deregisterLoggerHandlers();
 		try {
 			/* stop the web interface. */
 			webInterface.stop();
@@ -307,6 +312,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			webOfTrustConnector.stop();
 		} catch (Throwable t1) {
 			logger.log(Level.SEVERE, "Error while shutting down!", t1);
+		} finally {
+			deregisterLoggerHandlers();
 		}
 	}