X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=2d3e562f212dc167ebbde7c418efc6c709ca5617;hp=b80aa47e8e2889c790a63ff2f1bb1edbd83f68d3;hb=64740709990291688170ebd1f192af5eb9090618;hpb=3b189a710b9920d7e01a8ae1ca7938e4ba3b1f95 diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index b80aa47..2d3e562 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 @@ /* - * Sone - SonePlugin.java - Copyright © 2010–2013 David Roden + * Sone - SonePlugin.java - Copyright © 2010–2020 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 @@ -17,91 +17,69 @@ package net.pterodactylus.sone.main; -import static com.google.common.base.Optional.of; -import static java.util.logging.Logger.getLogger; +import static java.util.logging.Logger.*; -import java.io.File; -import java.util.logging.Handler; -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.core.WebOfTrustUpdaterImpl; -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.Context; -import net.pterodactylus.sone.freenet.wot.IdentityManager; -import net.pterodactylus.sone.freenet.wot.IdentityManagerImpl; -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.version.Version; - -import com.google.common.base.Optional; -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.spi.InjectionListener; -import com.google.inject.spi.TypeEncounter; -import com.google.inject.spi.TypeListener; - -import freenet.client.async.PersistenceDisabledException; -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; +import java.util.logging.*; + +import javax.annotation.Nonnull; + +import net.pterodactylus.sone.core.*; +import net.pterodactylus.sone.core.event.*; +import net.pterodactylus.sone.fcp.*; +import net.pterodactylus.sone.freenet.wot.*; +import net.pterodactylus.sone.web.*; +import net.pterodactylus.sone.web.notification.NotificationHandler; +import net.pterodactylus.sone.web.notification.NotificationHandlerModule; + +import freenet.l10n.BaseL10n.*; +import freenet.l10n.*; +import freenet.pluginmanager.*; +import freenet.support.*; +import freenet.support.api.*; + +import com.google.common.annotations.*; +import com.google.common.eventbus.*; +import com.google.common.cache.*; +import com.google.inject.*; +import com.google.inject.name.*; +import kotlin.jvm.functions.*; /** * This class interfaces with Freenet. It is the class that is loaded by the * node and starts up the whole Sone system. - * - * @author David ‘Bombe’ Roden */ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned { + private static final Logger soneLogger = getLogger("net.pterodactylus.sone"); + static { /* initialize logging. */ - Logger soneLogger = getLogger("Sone"); soneLogger.setUseParentHandlers(false); + soneLogger.setLevel(Level.ALL); soneLogger.addHandler(new Handler() { + private final LoadingCache> classCache = CacheBuilder.newBuilder() + .build(new CacheLoader>() { + @Override + public Class load(@Nonnull String key) throws Exception { + return SonePlugin.class.getClassLoader().loadClass(key); + } + }); + @Override public void publish(LogRecord logRecord) { int recordLevel = logRecord.getLevel().intValue(); + Class loggingClass = classCache.getUnchecked(logRecord.getLoggerName()); if (recordLevel < Level.FINE.intValue()) { - freenet.support.Logger.debug(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown()); + freenet.support.Logger.debug(loggingClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.INFO.intValue()) { - freenet.support.Logger.minor(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown()); + freenet.support.Logger.minor(loggingClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.WARNING.intValue()) { - freenet.support.Logger.normal(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown()); + freenet.support.Logger.normal(loggingClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.SEVERE.intValue()) { - freenet.support.Logger.warning(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown()); + freenet.support.Logger.warning(loggingClass, logRecord.getMessage(), logRecord.getThrown()); } else { - freenet.support.Logger.error(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown()); + freenet.support.Logger.error(loggingClass, logRecord.getMessage(), logRecord.getThrown()); } } @@ -115,16 +93,15 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr }); } - /** The version. */ - public static final Version VERSION = new Version(0, 9, 2); - /** The current year at time of release. */ - private static final int YEAR = 2015; + private static final int YEAR = 2020; private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/"; - private static final int LATEST_EDITION = 69; + private static final int LATEST_EDITION = 80; /** The logger. */ - private static final Logger logger = getLogger("Sone.Plugin"); + private static final Logger logger = getLogger(SonePlugin.class.getName()); + + private final Function1 injectorCreator; /** The plugin respirator. */ private PluginRespirator pluginRespirator; @@ -132,6 +109,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr /** The core. */ private Core core; + /** The event bus. */ + private EventBus eventBus; + /** The web interface. */ private WebInterface webInterface; @@ -144,6 +124,15 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr /** The web of trust connector. */ private WebOfTrustConnector webOfTrustConnector; + public SonePlugin() { + this(Guice::createInjector); + } + + @VisibleForTesting + public SonePlugin(Function1 injectorCreator) { + this.injectorCreator = injectorCreator; + } + // // ACCESSORS // @@ -175,14 +164,23 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr return l10n; } - public static int getYear() { + public static String getPluginVersion() { + net.pterodactylus.sone.main.Version version = VersionParserKt.getParsedVersion(); + return (version == null) ? "unknown" : version.getNice(); + } + + public int getYear() { return YEAR; } - public static String getHomepage() { + public String getHomepage() { return SONE_HOMEPAGE + LATEST_EDITION; } + public static long getLatestEdition() { + return LATEST_EDITION; + } + // // FREDPLUGIN METHODS // @@ -194,84 +192,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr public void runPlugin(PluginRespirator pluginRespirator) { this.pluginRespirator = pluginRespirator; - /* create a configuration. */ - Configuration oldConfiguration; - Configuration newConfiguration = null; - boolean firstStart = !new File("sone.properties").exists(); - boolean newConfig = false; - try { - 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 { - oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator)); - logger.log(Level.INFO, "Plugin store loaded."); - } catch (PersistenceDisabledException pde1) { - logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!"); - oldConfiguration = new Configuration(new MapConfigurationBackend()); - } - } - - final Configuration startConfiguration; - if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) { - logger.log(Level.INFO, "Setting configuration to file-based configuration."); - startConfiguration = newConfiguration; - } else { - 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(EventBus.class).toInstance(eventBus); - bind(Configuration.class).toInstance(startConfiguration); - Context context = new Context("Sone"); - bind(Context.class).toInstance(context); - bind(getOptionalContextTypeLiteral()).toInstance(of(context)); - bind(SonePlugin.class).toInstance(SonePlugin.this); - 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); - } - }); - } - }); - } - - private TypeLiteral> getOptionalContextTypeLiteral() { - return new TypeLiteral>() { - }; - } - - }; - Injector injector = Guice.createInjector(freenetModule, soneModule); + Injector injector = createInjector(); core = injector.getInstance(Core.class); /* create web of trust connector. */ @@ -283,11 +204,47 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr /* create the web interface. */ webInterface = injector.getInstance(WebInterface.class); + /* we need to request this to install all notification handlers. */ + injector.getInstance(NotificationHandler.class); + + /* and this is required to shutdown all tickers. */ + injector.getInstance(TickerShutdown.class); + /* start core! */ core.start(); + + /* start the web interface! */ webInterface.start(); - webInterface.setFirstStart(firstStart); - webInterface.setNewConfig(newConfig); + + /* send some events on startup */ + eventBus = injector.getInstance(EventBus.class); + + /* first start? */ + if (injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart")))) { + eventBus.post(new FirstStart()); + } else { + /* new config? */ + if (injector.getInstance(Key.get(Boolean.class, Names.named("NewConfig")))) { + eventBus.post(new ConfigNotRead()); + } + } + + eventBus.post(new Startup()); + } + + @VisibleForTesting + protected Injector createInjector() { + FreenetModule freenetModule = new FreenetModule(pluginRespirator); + AbstractModule soneModule = new SoneModule(this, new EventBus()); + Module webInterfaceModule = new WebInterfaceModule(); + Module notificationHandlerModule = new NotificationHandlerModule(); + + return createInjector(freenetModule, soneModule, webInterfaceModule, notificationHandlerModule); + } + + @VisibleForTesting + protected Injector createInjector(Module... modules) { + return injectorCreator.invoke(modules); } /** @@ -295,6 +252,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr */ @Override public void terminate() { + /* send shutdown event. */ + eventBus.post(new Shutdown()); + try { /* stop the web interface. */ webInterface.stop(); @@ -306,6 +266,14 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr webOfTrustConnector.stop(); } catch (Throwable t1) { logger.log(Level.SEVERE, "Error while shutting down!", t1); + } finally { + deregisterLoggerHandlers(); + } + } + + private void deregisterLoggerHandlers() { + for (Handler handler : soneLogger.getHandlers()) { + soneLogger.removeHandler(handler); } } @@ -386,7 +354,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr */ @Override public String getVersion() { - return VERSION.toString(); + return getPluginVersion(); } }