External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup server code

Browse source
This commit is contained in:
betasteward 2015-06-01 21:42:18 -04:00
parent 20a25ffdab
commit 71c7bc38e1
9 changed files with 12 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Network/src/main/java/org/mage/network/handlers/server/ChatMessageHandler.java
View file

@ -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();
}
}

11
Mage.Network/src/main/java/org/mage/network/handlers/server/ChatRoomIdHandler.java
View file

@ -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();
}
}

9
Mage.Network/src/main/java/org/mage/network/handlers/server/ConnectionHandler.java
View file

@ -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();
}
}

10
Mage.Network/src/main/java/org/mage/network/handlers/server/JoinChatMessageHandler.java
View file

@ -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();
}
}

11
Mage.Network/src/main/java/org/mage/network/handlers/server/LeaveChatMessageHandler.java
View file

@ -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();
}
}

10
Mage.Network/src/main/java/org/mage/network/handlers/server/RegisterClientMessageHandler.java
View file

@ -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();
}
}

13
Mage.Network/src/main/java/org/mage/network/handlers/server/RoomMessageHandler.java
View file

@ -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();
}
}

11
Mage.Network/src/main/java/org/mage/network/handlers/server/ServerMessageHandler.java
View file

@ -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();
}
}

5
Mage.Server/src/main/java/mage/server/Session.java
View file

@ -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() {