Prepare background updater to perform property and context updates, too.

[Sone.git] / src / main / java / net / pterodactylus / sone / main / SonePlugin.java

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 738c0d1..d16e931 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
+import net.pterodactylus.sone.core.WebOfTrustUpdater;
 import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
@@ -68,22 +69,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, 6);
+       public static final Version VERSION = new Version(0, 8, 2);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -103,6 +104,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;
 
@@ -181,12 +185,16 @@ 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");
 
+                       /* create trust updater. */
+                       WebOfTrustUpdater trustUpdater = new WebOfTrustUpdater(webOfTrustConnector);
+                       trustUpdater.init();
+
                        /* create core. */
-                       core = new Core(oldConfiguration, freenetInterface, identityManager);
+                       core = new Core(oldConfiguration, freenetInterface, identityManager, trustUpdater);
 
                        /* create the web interface. */
                        webInterface = new WebInterface(this);
@@ -236,6 +244,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 {