X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=f3e8dfc7bba7b7c30301c993b951bf5ea09f7530;hb=144cf48d9b40d0379456d61a504999612f530733;hp=f27cc6e5459ba8d4d5bd10cedd38d251e89260d2;hpb=b72db16cd16e8bfbaadc44604bdff3f49a1aff51;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 f27cc6e..f3e8dfc 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 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010â2016 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,33 +17,54 @@
package net.pterodactylus.sone.main;
+import static com.google.common.base.Optional.of;
+import static java.util.logging.Logger.getLogger;
+
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.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.Context;
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.logging.Logging;
-import net.pterodactylus.util.logging.LoggingListener;
import net.pterodactylus.util.version.Version;
-import freenet.client.async.DatabaseDisabledException;
+
+import com.google.common.base.Optional;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+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.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;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
@@ -51,37 +72,59 @@ 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 {
+
+ private static final Logger soneLogger = getLogger("net.pterodactylus.sone");
static {
/* initialize logging. */
- Logging.setup("sone");
- Logging.addLoggingListener(new LoggingListener() {
+ soneLogger.setUseParentHandlers(false);
+ soneLogger.addHandler(new Handler() {
+ private final LoadingCache> classCache = CacheBuilder.newBuilder()
+ .build(new CacheLoader>() {
+ @Override
+ public Class> load(String key) throws Exception {
+ return Class.forName(key);
+ }
+ });
@Override
- public void logged(LogRecord logRecord) {
- Class> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
+ 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(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.debug(loggingClass, 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(loggingClass, 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(loggingClass, 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(loggingClass, logRecord.getMessage(), logRecord.getThrown());
} else {
- freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.error(loggingClass, logRecord.getMessage(), logRecord.getThrown());
}
}
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() {
+ }
});
}
/** The version. */
- public static final Version VERSION = new Version(0, 6, 4);
+ private static final Version VERSION = new Version(0, 9, 5);
+
+ /** The current year at time of release. */
+ private static final int YEAR = 2016;
+ private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
+ private static final int LATEST_EDITION = 72;
/** The logger. */
- private static final Logger logger = Logging.getLogger(SonePlugin.class);
+ private static final Logger logger = getLogger(SonePlugin.class.getName());
/** The plugin respirator. */
private PluginRespirator pluginRespirator;
@@ -92,11 +135,14 @@ 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 identity manager. */
- private IdentityManager identityManager;
+ /** The web of trust connector. */
+ private WebOfTrustConnector webOfTrustConnector;
//
// ACCESSORS
@@ -129,6 +175,22 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
return l10n;
}
+ public static String getPluginVersion() {
+ return VERSION.toString();
+ }
+
+ public static int getYear() {
+ return YEAR;
+ }
+
+ public static String getHomepage() {
+ return SONE_HOMEPAGE + LATEST_EDITION;
+ }
+
+ public static long getLatestEdition() {
+ return LATEST_EDITION;
+ }
+
//
// FREDPLUGIN METHODS
//
@@ -160,54 +222,87 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
try {
oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
logger.log(Level.INFO, "Plugin store loaded.");
- } catch (DatabaseDisabledException dde1) {
+ } catch (PersistenceDisabledException pde1) {
logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
oldConfiguration = new Configuration(new MapConfigurationBackend());
}
}
- boolean startupFailed = true;
- try {
- /* create freenet interface. */
- FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
-
- /* 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(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();
- if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
- logger.log(Level.INFO, "Setting configuration to file-based configuration.");
- core.setConfiguration(newConfiguration);
+ 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());
}
- 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();
+ };
+ /* 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);
+ bind(Version.class).toInstance(VERSION);
+ if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
+ String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
+ if (path != null) {
+ bind(Loaders.class).toInstance(new DebugLoaders(path));
+ }
+ }
+ 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);
+ core = injector.getInstance(Core.class);
+
+ /* create web of trust connector. */
+ webOfTrustConnector = injector.getInstance(WebOfTrustConnector.class);
+
+ /* create FCP interface. */
+ fcpInterface = injector.getInstance(FcpInterface.class);
+
+ /* create the web interface. */
+ webInterface = injector.getInstance(WebInterface.class);
+
+ /* start core! */
+ core.start();
+ webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
}
/**
@@ -222,16 +317,33 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/* 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();
+ deregisterLoggerHandlers();
}
}
+ private void deregisterLoggerHandlers() {
+ for (Handler handler : soneLogger.getHandlers()) {
+ soneLogger.removeHandler(handler);
+ }
+ }
+
+ //
+ // INTERFACE FredPluginFCP
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
+ fcpInterface.handle(pluginReplySender, parameters, data, accessType);
+ }
+
//
// INTERFACE FredPluginL10n
//