X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=83fc71e66e06d141f5b1e107c67d0aadf31ae7bd;hb=7d5aff5d52afa5d9725ce252c846b1aca6f1a761;hp=c7afdd0213a7c1753c2a694ae5c777e84bd9ad88;hpb=84a2d480d9c45cf7c3513f9557dd00056b30336f;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 c7afdd0..b35c556 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
/*
- * FreenetSone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010 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
@@ -18,29 +18,37 @@
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.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
+import net.pterodactylus.sone.freenet.wot.IdentityManager;
+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;
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginBaseL10n;
+import freenet.pluginmanager.FredPluginFCP;
import freenet.pluginmanager.FredPluginL10n;
import freenet.pluginmanager.FredPluginThreadless;
import freenet.pluginmanager.FredPluginVersioned;
+import freenet.pluginmanager.PluginReplySender;
import freenet.pluginmanager.PluginRespirator;
+import freenet.support.SimpleFieldSet;
+import freenet.support.api.Bucket;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
@@ -48,15 +56,34 @@ import freenet.pluginmanager.PluginRespirator;
*
* @author David âBombeâ Roden
*/
-public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
+public class SonePlugin implements FredPlugin, FredPluginFCP, 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. */
- private static final Version VERSION = new Version("SNAPSHOT", 0, 1);
+ public static final Version VERSION = new Version(0, 7, 3);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -70,9 +97,18 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/** The web interface. */
private WebInterface webInterface;
+ /** The FCP interface. */
+ private FcpInterface fcpInterface;
+
/** The l10n helper. */
private PluginL10n l10n;
+ /** The web of trust connector. */
+ private WebOfTrustConnector webOfTrustConnector;
+
+ /** The identity manager. */
+ private IdentityManager identityManager;
+
//
// ACCESSORS
//
@@ -116,33 +152,77 @@ 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());
-
- /* create the web interface. */
- webInterface = new WebInterface(this);
-
- /* create core. */
- core = new Core();
- core.configuration(configuration);
- core.freenetInterface(freenetInterface);
-
- /* start core! */
- core.start();
- webInterface.start();
+ boolean startupFailed = true;
+ try {
+ /* create freenet interface. */
+ FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
+
+ /* create web of trust connector. */
+ PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+ webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+ identityManager = new IdentityManager(webOfTrustConnector);
+ identityManager.setContext("Sone");
+
+ /* create core. */
+ core = new Core(oldConfiguration, freenetInterface, identityManager);
+
+ /* create the web interface. */
+ webInterface = new WebInterface(this);
+ core.addCoreListener(webInterface);
+
+ /* create FCP interface. */
+ fcpInterface = new FcpInterface(core);
+ core.setFcpInterface(fcpInterface);
+
+ /* create the identity manager. */
+ identityManager.addIdentityListener(core);
+
+ /* start core! */
+ 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();
+ }
+ }
}
/**
@@ -150,13 +230,36 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
*/
@Override
public void terminate() {
- /* stop the web interface. */
- webInterface.stop();
+ try {
+ /* stop the web interface. */
+ webInterface.stop();
+
+ /* stop the core. */
+ core.stop();
+
+ /* 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 {
+ /* shutdown logger. */
+ Logging.shutdown();
+ }
+ }
- /* stop the core. */
- core.stop();
+ //
+ // INTERFACE FredPluginFCP
+ //
- /* TODO wait for core to stop? */
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
+ fcpInterface.handle(pluginReplySender, parameters, data, accessType);
}
//