X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fmain%2FMain.java;h=327273604ad1ac1d1802d9017cd4f2657d7a8c93;hb=7dae740158c9cf9e702b4a311eb00c644bfb0a06;hp=381c6a593245375de9acb46e156da5d0d180cba0;hpb=eee631ee889a50be9bc498d9aabb7fccf9b8f68e;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 381c6a5..3272736 100644 --- a/src/main/java/net/pterodactylus/xdcc/main/Main.java +++ b/src/main/java/net/pterodactylus/xdcc/main/Main.java @@ -20,19 +20,11 @@ package net.pterodactylus.xdcc.main; import static com.lexicalscope.jewel.cli.CliFactory.parseArguments; import java.io.File; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; 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.xdcc.core.Core; import net.pterodactylus.xdcc.data.Channel; import net.pterodactylus.xdcc.data.Download; @@ -62,21 +54,6 @@ 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()); @@ -106,10 +83,6 @@ public class Main { Collection failedDownloads = new CopyOnWriteArraySet<>(); - CommandReader commandReader = new CommandReader(core, new InputStreamReader(System.in, "UTF-8"), new OutputStreamWriter(System.out, "UTF-8"), failedDownloads); - commandReader.start(); - eventBus.register(commandReader); - NetworkAdapter networkAcceptor = new NetworkAdapter(eventBus, (reader, writer) -> new CommandReader(core, reader, writer, failedDownloads), configuration.getTelnetPort()); networkAcceptor.start();