X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=6f2a90866fe3ec24b4d0b5d07f1dc4f2d96263e0;hb=d9f0a171bab2137df371a7c4948a95d1975116c0;hp=7ac2c8387e1ec90377ae60b05a78cdec8445aaf3;hpb=df67609c4eebc32a728bd35bfb9729a8e63c5bf7;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 7ac2c83..6f2a908 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–2013 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,58 @@ 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.core.WebOfTrustUpdater; +import net.pterodactylus.sone.database.Database; +import net.pterodactylus.sone.database.PostBuilderFactory; +import net.pterodactylus.sone.database.PostProvider; +import net.pterodactylus.sone.database.PostReplyBuilderFactory; +import net.pterodactylus.sone.database.SoneProvider; +import net.pterodactylus.sone.database.memory.MemoryDatabase; +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 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.name.Names; +import com.google.inject.spi.InjectionListener; +import com.google.inject.spi.TypeEncounter; +import com.google.inject.spi.TypeListener; + import freenet.client.async.DatabaseDisabledException; import freenet.l10n.BaseL10n.LANGUAGE; import freenet.l10n.PluginL10n; +import freenet.node.Node; 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 +77,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, logRecord.getMessage(), logRecord.getThrown()); + } else if (recordLevel < Level.INFO.intValue()) { + freenet.support.Logger.minor(loggerClass, logRecord.getMessage(), logRecord.getThrown()); + } else if (recordLevel < Level.WARNING.intValue()) { + freenet.support.Logger.normal(loggerClass, logRecord.getMessage(), logRecord.getThrown()); + } else if (recordLevel < Level.SEVERE.intValue()) { + freenet.support.Logger.warning(loggerClass, logRecord.getMessage(), logRecord.getThrown()); + } else { + freenet.support.Logger.error(loggerClass, logRecord.getMessage(), logRecord.getThrown()); + } + } + }); } /** The version. */ - private static final Version VERSION = new Version("SNAPSHOT", 0, 1); + public static final Version VERSION = new Version(0, 8, 6); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); @@ -70,9 +118,15 @@ 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; + // // ACCESSORS // @@ -116,33 +170,118 @@ 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()); + final Configuration startConfiguration = oldConfiguration; + final EventBus eventBus = new EventBus(); + + /* Freenet injector configuration. */ + AbstractModule freenetModule = new AbstractModule() { + + @Override + @SuppressWarnings("synthetic-access") + protected void configure() { + bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator); + bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode()); + } + }; + /* Sone injector configuration. */ + AbstractModule soneModule = new AbstractModule() { + + @Override + protected void configure() { + bind(Core.class).in(Singleton.class); + bind(MemoryDatabase.class).in(Singleton.class); + bind(EventBus.class).toInstance(eventBus); + bind(Configuration.class).toInstance(startConfiguration); + bind(FreenetInterface.class).in(Singleton.class); + bind(PluginConnector.class).in(Singleton.class); + bind(WebOfTrustConnector.class).in(Singleton.class); + bind(WebOfTrustUpdater.class).in(Singleton.class); + bind(IdentityManager.class).in(Singleton.class); + bind(String.class).annotatedWith(Names.named("WebOfTrustContext")).toInstance("Sone"); + bind(SonePlugin.class).toInstance(SonePlugin.this); + bind(FcpInterface.class).in(Singleton.class); + bind(Database.class).to(MemoryDatabase.class); + bind(PostBuilderFactory.class).to(MemoryDatabase.class); + bind(PostReplyBuilderFactory.class).to(MemoryDatabase.class); + bind(SoneProvider.class).to(Core.class).in(Singleton.class); + bind(PostProvider.class).to(MemoryDatabase.class); + bindListener(Matchers.any(), new TypeListener() { + + @Override + public void hear(TypeLiteral typeLiteral, TypeEncounter typeEncounter) { + typeEncounter.register(new InjectionListener() { + + @Override + public void afterInjection(I injectee) { + eventBus.register(injectee); + } + }); + } + }); + } + + }; + Injector injector = Guice.createInjector(freenetModule, soneModule); + core = injector.getInstance(Core.class); + + /* create web of trust connector. */ + webOfTrustConnector = injector.getInstance(WebOfTrustConnector.class); + + /* create FCP interface. */ + fcpInterface = injector.getInstance(FcpInterface.class); + core.setFcpInterface(fcpInterface); /* create the web interface. */ - webInterface = new WebInterface(this); + webInterface = injector.getInstance(WebInterface.class); - /* create core. */ - core = new Core(); - core.configuration(configuration); - core.freenetInterface(freenetInterface); + boolean startupFailed = true; + try { - /* start core! */ - core.start(); - webInterface.start(); + /* 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); + 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,16 +289,33 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 */ @Override public void terminate() { - /* stop the web interface. */ - webInterface.stop(); - - /* stop the core. */ - core.stop(); + try { + /* stop the web interface. */ + webInterface.stop(); + + /* stop the core. */ + core.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(); + } + } - /* TODO wait for core to stop? */ + // + // INTERFACE FredPluginFCP + // - /* shutdown logger. */ - Logging.shutdown(); + /** + * {@inheritDoc} + */ + @Override + public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) { + fcpInterface.handle(pluginReplySender, parameters, data, accessType); } //