From 8a6482c523e6f52ebbf6fef4c0fae0bb41e6d0d6 Mon Sep 17 00:00:00 2001 From: JeromSar Date: Sat, 18 Jun 2016 17:25:57 +0200 Subject: [PATCH] Don't log SocketExceptions. Fixes #9 --- .../bukkittelnet/TelnetLogAppender.java | 1 + .../bukkittelnet/session/ClientSession.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogAppender.java b/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogAppender.java index 44c5e73..697728f 100644 --- a/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogAppender.java +++ b/src/main/java/me/totalfreedom/bukkittelnet/TelnetLogAppender.java @@ -16,6 +16,7 @@ import org.apache.logging.log4j.core.appender.AbstractAppender; public class TelnetLogAppender extends AbstractAppender { + private static final long serialVersionUID = 234234L; private final Set sessions; private final SimpleDateFormat dateFormat; diff --git a/src/main/java/me/totalfreedom/bukkittelnet/session/ClientSession.java b/src/main/java/me/totalfreedom/bukkittelnet/session/ClientSession.java index 42c0b9c..557fd72 100644 --- a/src/main/java/me/totalfreedom/bukkittelnet/session/ClientSession.java +++ b/src/main/java/me/totalfreedom/bukkittelnet/session/ClientSession.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.net.Socket; +import java.net.SocketException; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -77,7 +78,14 @@ public final class ClientSession extends Thread syncTerminateSession(); } + writeLine("Logged in as " + username + "."); + TelnetLogger.info(clientAddress + " logged in as \"" + username + "\"."); + + // Start feeding data to the client. + telnet.getPlugin().appender.addSession(this); + mainLoop(); + syncTerminateSession(); } @@ -356,12 +364,6 @@ public final class ClientSession extends Thread return; } - writeLine("Logged in as " + username + "."); - TelnetLogger.info(clientAddress + " logged in as \"" + username + "\"."); - - // Start feeding data to the client. - telnet.getPlugin().appender.addSession(this); - // Process commands while (syncIsConnected()) { @@ -371,6 +373,10 @@ public final class ClientSession extends Thread { command = reader.readLine(); } + catch (SocketException ex) + { + break; + } catch (IOException ex) { TelnetLogger.severe(ex);