From 9838590896ab6d4fe9a247539970a71e87635fb3 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 14 Aug 2014 08:15:58 +0200 Subject: [PATCH] Changed lost connection handling. Changed logging message. --- Mage.Server/src/main/java/mage/server/Main.java | 9 ++++++--- .../mage/server/tournament/TournamentController.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index 18f0dc35ab4..8f11e4593e5 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -199,12 +199,15 @@ public class Main { } sessionInfo.append(" at ").append(session.getHost()).append(" sessionId: ").append(session.getId()); if (throwable instanceof ClientDisconnectedException) { - SessionManager.getInstance().disconnect(client.getSessionId(), DisconnectReason.Disconnected); - logger.debug("Client disconnected - " + sessionInfo); + // Seems like the random diconnects from public server land here and should not be handled as explicit disconnects + // So it should be possible to reconnect to server and continue games if DisconnectReason is set to LostConnection + //SessionManager.getInstance().disconnect(client.getSessionId(), DisconnectReason.Disconnected); + SessionManager.getInstance().disconnect(client.getSessionId(), DisconnectReason.LostConnection); + logger.debug("Client disconnected - " + sessionInfo + " throwable: " + throwable == null ? "null" :throwable.getMessage()); } else { SessionManager.getInstance().disconnect(client.getSessionId(), DisconnectReason.LostConnection); - logger.info("Connection to client lost - " + sessionInfo); + logger.info("Connection to client lost - " + sessionInfo + " throwable: " + (throwable == null ? "null" :throwable.getMessage())); } } } diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java index f3c045d0582..f01d01069b8 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java @@ -174,7 +174,7 @@ public class TournamentController { ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK, true, MessageType.STATUS); checkStart(); } else { - logger.error("TournamentController.join user not found uderId: " +userId + " tournamentId: " + tournament.getId()); + logger.error("User not found userId: " + userId + " tournamentId: " + tournament.getId()); } }