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.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;
static {
/* initialize logging. */
Logging.setup("sone");
- Logging.setupConsoleLogging();
- /*
- * 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()); } } });
- */
+ 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. */
- public static final Version VERSION = new Version("RC1", 0, 2);
+ public static final Version VERSION = new Version("RC2", 0, 3, 1);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
- Configuration configuration;
+ Configuration oldConfiguration;
+ Configuration newConfiguration = null;
try {
- configuration = new Configuration(new PluginStoreConfigurationBackend(pluginStore = 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) {
+ logger.log(Level.INFO, "Could not load configuration file, trying plugin store…");
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.<String, String> emptyMap()));
+ 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!");
+ }
+ try {
+ 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());
}
}
identityManager = new IdentityManager(webOfTrustConnector);
identityManager.setContext("Sone");
+ /* create core. */
+ core = new Core(oldConfiguration, freenetInterface, identityManager);
+
/* create the web interface. */
webInterface = new WebInterface(this);
-
- /* create core. */
- core = new Core(configuration, freenetInterface, identityManager);
+ core.addCoreListener(webInterface);
/* create the identity manager. */
identityManager.addIdentityListener(core);
boolean startupFailed = true;
try {
core.start();
+ if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+ logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+ core.setConfiguration(newConfiguration);
+ }
webInterface.start();
identityManager.start();
startupFailed = false;