X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=6f4fd02d7786f5bb35eacf6fc1ebcc4d023bff7f;hb=a97bd2a5a5d804d53f9fdf4ff3afa985b6eae2fb;hp=f6fc60acc6873e138c2514365aa86f70914ef4c4;hpb=d74201ece068d856f7b102cc997b729c9e810c9a;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 f6fc60a..6f4fd02 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â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
@@ -26,22 +26,14 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import javax.inject.Singleton;
+
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;
@@ -50,21 +42,22 @@ import net.pterodactylus.util.config.MapConfigurationBackend;
import net.pterodactylus.util.version.Version;
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.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.DatabaseDisabledException;
+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;
@@ -79,29 +72,37 @@ import freenet.support.api.Bucket;
/**
* 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.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 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,11 +116,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
});
}
- /** The version. */
- public static final Version VERSION = new Version(0, 8, 9);
+ /** The current year at time of release. */
+ private static final int YEAR = 2017;
+ private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
+ private static final int LATEST_EDITION = 77;
/** The logger. */
- private static final Logger logger = getLogger("Sone.Plugin");
+ private static final Logger logger = getLogger(SonePlugin.class.getName());
/** The plugin respirator. */
private PluginRespirator pluginRespirator;
@@ -170,6 +173,23 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
return l10n;
}
+ public static String getPluginVersion() {
+ net.pterodactylus.sone.main.Version version = VersionParserKt.getParsedVersion();
+ return (version == null) ? "unknown" : version.getNice();
+ }
+
+ public static int getYear() {
+ return YEAR;
+ }
+
+ public static String getHomepage() {
+ return SONE_HOMEPAGE + LATEST_EDITION;
+ }
+
+ public static long getLatestEdition() {
+ return LATEST_EDITION;
+ }
+
//
// FREDPLUGIN METHODS
//
@@ -201,7 +221,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
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());
}
@@ -217,15 +237,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
final EventBus eventBus = new EventBus();
/* Freenet injector configuration. */
- AbstractModule freenetModule = new AbstractModule() {
+ FreenetModule freenetModule = new FreenetModule(pluginRespirator);
- @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() {
@@ -237,6 +250,17 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
bind(Context.class).toInstance(context);
bind(getOptionalContextTypeLiteral()).toInstance(of(context));
bind(SonePlugin.class).toInstance(SonePlugin.this);
+ bind(Version.class).toInstance(Version.parse(getVersion()));
+ bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
+ bind(PluginYear.class).toInstance(new PluginYear(getYear()));
+ bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
+ bind(Database.class).to(MemoryDatabase.class).in(Singleton.class);
+ 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
@@ -293,6 +317,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);
}
}
@@ -373,7 +405,49 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
*/
@Override
public String getVersion() {
- return VERSION.toString();
+ return getPluginVersion();
+ }
+
+ public static class PluginVersion {
+
+ private final String version;
+
+ public PluginVersion(String version) {
+ this.version = version;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ }
+
+ public static class PluginYear {
+
+ private final int year;
+
+ public PluginYear(int year) {
+ this.year = year;
+ }
+
+ public int getYear() {
+ return year;
+ }
+
+ }
+
+ public static class PluginHomepage {
+
+ private final String homepage;
+
+ public PluginHomepage(String homepage) {
+ this.homepage = homepage;
+ }
+
+ public String getHomepage() {
+ return homepage;
+ }
+
}
}