X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fmain%2FMain.java;h=c9b7c5b9584564be58359e72f8d7601250553204;hb=8593a0995d655bebada567ab98a9de2cdf078243;hp=5601f05d40cb0cb183e6b56bce1cac9a911f9315;hpb=20f9fec6ac04b437605e5444c810104f57db9749;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/xdcc/main/Main.java b/src/main/java/net/pterodactylus/xdcc/main/Main.java index 5601f05..c9b7c5b 100644 --- a/src/main/java/net/pterodactylus/xdcc/main/Main.java +++ b/src/main/java/net/pterodactylus/xdcc/main/Main.java @@ -24,13 +24,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Executors; -import java.util.logging.ConsoleHandler; -import java.util.logging.Formatter; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import net.pterodactylus.irc.Connection; +import net.pterodactylus.irc.ConnectionFactory; +import net.pterodactylus.irc.DefaultConnectionFactory; import net.pterodactylus.xdcc.core.Core; import net.pterodactylus.xdcc.data.Channel; import net.pterodactylus.xdcc.data.Download; @@ -60,27 +56,13 @@ public class Main { public static void main(String... arguments) throws Exception { - ConsoleHandler consoleHandler = new ConsoleHandler(); - consoleHandler.setFormatter(new Formatter() { - - @Override - public String format(LogRecord logRecord) { - return String.format("%1$tF %1$tT %2$s %3$s\n", logRecord.getMillis(), logRecord.getLoggerName(), logRecord.getMessage()); - } - }); - consoleHandler.setLevel(Level.ALL); - Logger.getLogger("").removeHandler(Logger.getLogger("").getHandlers()[0]); - Logger.getLogger("").addHandler(consoleHandler); - Logger.getLogger("").setLevel(Level.ALL); - Logger.getLogger(Connection.class.getName()).setLevel(Level.INFO); - Logger.getLogger(Core.class.getName()).setLevel(Level.INFO); - Parameters parameters = parseArguments(Parameters.class, arguments); EventBus eventBus = new AsyncEventBus(Executors.newSingleThreadExecutor()); Configuration configuration = new ObjectMapper().readValue(new File(parameters.getConfiguration()), Configuration.class); + ConnectionFactory connectionFactory = new DefaultConnectionFactory(eventBus); - Core core = new Core(eventBus, configuration.getTemporaryDirectory(), configuration.getFinalDirectory()); + Core core = new Core(eventBus, connectionFactory, configuration.getTemporaryDirectory(), configuration.getFinalDirectory()); eventBus.register(core); for (Configuration.Network network : configuration.getNetworks()) {