X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=e5b64820455b0dc5bc81c9582bd5d209b916a936;hb=f292324b7307ed59eabc25305a93c31901d732dc;hp=8af45c6c9befd68a7aef08a948ff9a4d011ae694;hpb=db5fa52470a5bbc5ec73d49469a8a775cefd944a;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 8af45c6..e5b6482 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -18,19 +18,23 @@
package net.pterodactylus.sone.main;
import java.io.File;
-import java.util.Collections;
import java.util.logging.Level;
+import java.util.logging.LogRecord;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.FreenetInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.wot.IdentityManager;
+import net.pterodactylus.sone.freenet.wot.PluginConnector;
+import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.config.MapConfigurationBackend;
-import net.pterodactylus.util.config.XMLConfigurationBackend;
import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.logging.LoggingListener;
+import net.pterodactylus.util.version.Version;
import freenet.client.async.DatabaseDisabledException;
import freenet.l10n.BaseL10n.LANGUAGE;
import freenet.l10n.PluginL10n;
@@ -38,6 +42,7 @@ import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginBaseL10n;
import freenet.pluginmanager.FredPluginL10n;
import freenet.pluginmanager.FredPluginThreadless;
+import freenet.pluginmanager.FredPluginVersioned;
import freenet.pluginmanager.PluginRespirator;
/**
@@ -46,13 +51,35 @@ import freenet.pluginmanager.PluginRespirator;
*
* @author David âBombeâ Roden
*/
-public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless {
+public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
static {
/* initialize logging. */
Logging.setup("sone");
+ Logging.addLoggingListener(new LoggingListener() {
+
+ @Override
+ public void logged(LogRecord logRecord) {
+ 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());
+ } else if (recordLevel < Level.INFO.intValue()) {
+ freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ } else if (recordLevel < Level.WARNING.intValue()) {
+ freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ } else if (recordLevel < Level.SEVERE.intValue()) {
+ freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ } else {
+ freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ }
+ }
+ });
}
+ /** The version. */
+ public static final Version VERSION = new Version(0, 3, 6);
+
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -62,9 +89,15 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/** The core. */
private Core core;
+ /** The web interface. */
+ private WebInterface webInterface;
+
/** The l10n helper. */
private PluginL10n l10n;
+ /** The identity manager. */
+ private IdentityManager identityManager;
+
//
// ACCESSORS
//
@@ -108,33 +141,73 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
- Configuration configuration;
+ Configuration oldConfiguration;
+ Configuration newConfiguration = null;
+ boolean firstStart = !new File("sone.properties").exists();
+ boolean newConfig = false;
try {
- configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator.getStore()));
- } catch (DatabaseDisabledException dde1) {
- logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
+ oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
+ newConfiguration = oldConfiguration;
+ } catch (ConfigurationException ce1) {
+ newConfig = true;
+ logger.log(Level.INFO, "Could not load configuration file, trying plugin storeâ¦", ce1);
+ try {
+ newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
+ logger.log(Level.INFO, "Created new configuration file.");
+ } catch (ConfigurationException ce2) {
+ logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!", ce2);
+ }
try {
- configuration = new Configuration(new XMLConfigurationBackend(new File("sone.xml"), true));
- } catch (ConfigurationException ce1) {
- logger.log(Level.SEVERE, "Could not load or create the âsone.xmlâ configuration file!");
- configuration = new Configuration(new MapConfigurationBackend(Collections. emptyMap()));
+ oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+ logger.log(Level.INFO, "Plugin store loaded.");
+ } catch (DatabaseDisabledException dde1) {
+ logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
+ oldConfiguration = new Configuration(new MapConfigurationBackend());
}
}
/* create freenet interface. */
- FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+ FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
- /* create the web interface. */
- WebInterface webInterface = new WebInterface(this);
+ /* 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();
- core.configuration(configuration);
- core.freenetInterface(freenetInterface);
+ core = new Core(oldConfiguration, freenetInterface, identityManager);
+
+ /* create the web interface. */
+ webInterface = new WebInterface(this);
+ core.addCoreListener(webInterface);
+
+ /* create the identity manager. */
+ identityManager.addIdentityListener(core);
/* start core! */
- core.start();
- webInterface.start();
+ boolean startupFailed = true;
+ try {
+ core.start();
+ if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+ logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+ core.setConfiguration(newConfiguration);
+ }
+ webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
+ identityManager.start();
+ startupFailed = false;
+ } finally {
+ if (startupFailed) {
+ /*
+ * we let the exception bubble up but shut the logging down so
+ * that the logfile is not swamped by the installed logging
+ * handlers of the failed instances.
+ */
+ Logging.shutdown();
+ }
+ }
}
/**
@@ -142,10 +215,21 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
*/
@Override
public void terminate() {
- /* stop the core. */
- core.stop();
+ try {
+ /* stop the web interface. */
+ webInterface.stop();
- /* TODO wait for core to stop? */
+ /* stop the core. */
+ core.stop();
+
+ /* stop the identity manager. */
+ identityManager.stop();
+ } catch (Throwable t1) {
+ logger.log(Level.SEVERE, "Error while shutting down!", t1);
+ } finally {
+ /* shutdown logger. */
+ Logging.shutdown();
+ }
}
//
@@ -204,4 +288,16 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
return SonePlugin.class.getClassLoader();
}
+ //
+ // INTERFACE FredPluginVersioned
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getVersion() {
+ return VERSION.toString();
+ }
+
}