From 71c7bc38e1ceb0e015aaaa969adf82c32ba95ca7 Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Mon, 1 Jun 2015 21:42:18 -0400
Subject: [PATCH] cleanup server code

---
 .../network/handlers/server/ChatMessageHandler.java | 11 -----------
 .../network/handlers/server/ChatRoomIdHandler.java  | 11 -----------
 .../network/handlers/server/ConnectionHandler.java  |  9 +++++++++
 .../handlers/server/JoinChatMessageHandler.java     | 10 ----------
 .../handlers/server/LeaveChatMessageHandler.java    | 11 -----------
 .../server/RegisterClientMessageHandler.java        | 10 ----------
 .../network/handlers/server/RoomMessageHandler.java | 13 -------------
 .../handlers/server/ServerMessageHandler.java       | 11 -----------
 Mage.Server/src/main/java/mage/server/Session.java  |  5 +++--
 9 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatMessageHandler.java
index d09844b8969..c020fbe4bbd 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatMessageHandler.java
@@ -24,15 +24,4 @@ public class ChatMessageHandler extends SimpleChannelInboundHandler<SendChatMess
         server.receiveChatMessage(msg.getChatId(), ctx.channel().id().asLongText(), msg.getMessage());
     }
     
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatRoomIdHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatRoomIdHandler.java
index f1db4834ce7..2d2eb03ae15 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatRoomIdHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/ChatRoomIdHandler.java
@@ -25,15 +25,4 @@ public class ChatRoomIdHandler extends SimpleChannelInboundHandler<ChatRoomIdReq
         ctx.writeAndFlush(new ChatRoomIdMessage(server.getRoomChatId(msg.getId())));        
     }
     
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/ConnectionHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/ConnectionHandler.java
index 964a8fcf938..c13e1acdbc5 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/ConnectionHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/ConnectionHandler.java
@@ -2,6 +2,7 @@ package org.mage.network.handlers.server;
 
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
+import org.apache.log4j.Logger;
 import org.mage.network.Server;
 
 /**
@@ -10,10 +11,18 @@ import org.mage.network.Server;
  */
 public class ConnectionHandler extends ChannelHandlerAdapter {
 
+    private static final Logger logger = Logger.getLogger(ConnectionHandler.class);
+
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         Server.clients.add(ctx.channel());
         super.channelActive(ctx);
     }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        logger.error("Communications error", cause);
+        ctx.close();
+    }
     
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/JoinChatMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/JoinChatMessageHandler.java
index ee597524a3d..0a964ca6e0f 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/JoinChatMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/JoinChatMessageHandler.java
@@ -24,14 +24,4 @@ public class JoinChatMessageHandler extends SimpleChannelInboundHandler<JoinChat
         server.joinChat(msg.getChatId(), ctx.channel().id().asLongText());
     }
     
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/LeaveChatMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/LeaveChatMessageHandler.java
index d38b810a2ae..c98bfcc82e0 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/LeaveChatMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/LeaveChatMessageHandler.java
@@ -24,15 +24,4 @@ public class LeaveChatMessageHandler extends SimpleChannelInboundHandler<JoinCha
         server.leaveChat(msg.getChatId(), ctx.channel().id().asLongText());
     }
     
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/RegisterClientMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/RegisterClientMessageHandler.java
index 19c28f1b20c..1bcfc442588 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/RegisterClientMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/RegisterClientMessageHandler.java
@@ -36,14 +36,4 @@ public class RegisterClientMessageHandler extends SimpleChannelInboundHandler<Re
         server.disconnect(ctx.channel().id().asLongText(), DisconnectReason.Disconnected);
     }
 
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/RoomMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/RoomMessageHandler.java
index 7aeaa108c2d..5033dce117e 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/RoomMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/RoomMessageHandler.java
@@ -4,8 +4,6 @@ import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import org.mage.network.interfaces.MageServer;
-import org.mage.network.model.ServerMessagesMessage;
-import org.mage.network.model.ServerMessagesRequest;
 import org.mage.network.model.RoomMessage;
 import org.mage.network.model.RoomRequest;
 
@@ -26,16 +24,5 @@ public class RoomMessageHandler extends SimpleChannelInboundHandler<RoomRequest>
     public void messageReceived(ChannelHandlerContext ctx, RoomRequest msg) {
         ctx.writeAndFlush(new RoomMessage(server.getRoom(msg.getRoomId())));        
     }
-    
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
 
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/server/ServerMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/server/ServerMessageHandler.java
index df73013ed40..00ac406b753 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/server/ServerMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/server/ServerMessageHandler.java
@@ -25,15 +25,4 @@ public class ServerMessageHandler extends SimpleChannelInboundHandler<ServerMess
         ctx.writeAndFlush(new ServerMessagesMessage(server.getServerMessages()));        
     }
     
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) {
-        ctx.flush();
-    }
-
-    
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        cause.printStackTrace();
-        ctx.close();
-    }
 }
diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java
index cc9bbf6e549..00801348034 100644
--- a/Mage.Server/src/main/java/mage/server/Session.java
+++ b/Mage.Server/src/main/java/mage/server/Session.java
@@ -346,10 +346,11 @@ public class Session {
             pingTime.poll();
         }
         long sum = 0;
-        for (Long time :pingTime) {
+        for (Long time : pingTime) {
             sum += time;
         }
-        pingInfo = lastPing + " (Av: " + (milliSeconds > 0 ? milliSeconds + "ms":"<1ms")+")";
+        long avg = sum / pingTime.size();
+        pingInfo = lastPing + " (Av: " + (avg > 0 ? avg + "ms":"<1ms")+")";
     }
 
     public String getPingInfo() {