diff --git a/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java b/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java index 0d3145a9..ad29eca7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java @@ -21,6 +21,7 @@ import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.stream.ChunkedWriteHandler; import com.xiaoleilu.loServer.action.ClassUtil; import org.slf4j.LoggerFactory; +import win.liyufan.im.Utility; import java.io.IOException; @@ -141,6 +142,7 @@ public class LoServer { } } catch (IOException e) { e.printStackTrace(); + Utility.printExecption(Logger, e); } catch (ClassNotFoundException e) { e.printStackTrace(); } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java index 79977868..18ea3f90 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java @@ -9,6 +9,7 @@ package com.xiaoleilu.loServer.action.admin; import com.google.gson.Gson; +import com.xiaoleilu.loServer.LoServer; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.handler.Request; @@ -17,9 +18,12 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import cn.wildfirechat.common.ErrorCode; +import org.slf4j.LoggerFactory; import win.liyufan.im.RateLimiter; +import win.liyufan.im.Utility; abstract public class AdminAction extends Action { + private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(AdminAction.class); private static String SECRET_KEY = "123456"; private static boolean NO_CHECK_TIME = false; private final RateLimiter mLimitCounter = new RateLimiter(10, 500); @@ -52,6 +56,7 @@ abstract public class AdminAction extends Action { ts = Long.parseLong(timestamp); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); return ErrorCode.INVALID_PARAMETER; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java index 1b7ed360..827185b7 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java @@ -22,11 +22,15 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import cn.wildfirechat.common.ErrorCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import win.liyufan.im.UUIDGenerator; +import win.liyufan.im.Utility; @Route(APIPath.Create_Robot) @HttpMethod("POST") public class CreateRobotAction extends AdminAction { + private static final Logger LOG = LoggerFactory.getLogger(CreateRobotAction.class); @Override public boolean isTransactionAction() { @@ -59,6 +63,7 @@ public class CreateRobotAction extends AdminAction { messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword()); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); response.setStatus(HttpResponseStatus.OK); RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()); response.setContent(new Gson().toJson(result)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java index a288d641..a9860b88 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java @@ -22,11 +22,16 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import cn.wildfirechat.common.ErrorCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import win.liyufan.im.DBUtil; import win.liyufan.im.UUIDGenerator; +import win.liyufan.im.Utility; @Route(APIPath.Create_User) @HttpMethod("POST") public class CreateUserAction extends AdminAction { + private static final Logger LOG = LoggerFactory.getLogger(CreateUserAction.class); @Override public boolean isTransactionAction() { @@ -80,6 +85,7 @@ public class CreateUserAction extends AdminAction { messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword()); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); response.setStatus(HttpResponseStatus.OK); RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()); response.setContent(new Gson().toJson(result)); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java index 477738be..043602ee 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java @@ -12,6 +12,7 @@ import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.action.Action; +import com.xiaoleilu.loServer.action.admin.AdminAction; import com.xiaoleilu.loServer.handler.Request; import com.xiaoleilu.loServer.handler.Response; import io.moquette.spi.impl.Utils; @@ -21,9 +22,12 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import cn.wildfirechat.common.ErrorCode; +import org.slf4j.LoggerFactory; import win.liyufan.im.RateLimiter; +import win.liyufan.im.Utility; abstract public class ChannelAction extends Action { + private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ChannelAction.class); private final RateLimiter mLimitCounter = new RateLimiter(10, 200); protected WFCMessage.ChannelInfo channelInfo; @@ -47,6 +51,7 @@ abstract public class ChannelAction extends Action { ts = Long.parseLong(timestamp); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); return ErrorCode.INVALID_PARAMETER; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java index 3b568b7a..b285c0bd 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java @@ -14,6 +14,7 @@ import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.handler.Request; import com.xiaoleilu.loServer.handler.Response; +import io.moquette.imhandler.IMHandler; import io.moquette.spi.impl.Utils; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpRequest; @@ -21,11 +22,15 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import cn.wildfirechat.common.ErrorCode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import win.liyufan.im.RateLimiter; +import win.liyufan.im.Utility; import java.io.UnsupportedEncodingException; abstract public class RobotAction extends Action { + protected static final Logger LOG = LoggerFactory.getLogger(RobotAction.class); private final RateLimiter mLimitCounter = new RateLimiter(10, 1000); protected WFCMessage.Robot robot; @@ -49,6 +54,7 @@ abstract public class RobotAction extends Action { ts = Long.parseLong(timestamp); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); return ErrorCode.INVALID_PARAMETER; } @@ -89,6 +95,7 @@ abstract public class RobotAction extends Action { return t; } catch (UnsupportedEncodingException e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } return null; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java index 6f24d6ec..9815df55 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java @@ -21,6 +21,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import win.liyufan.im.Utility; /** * Action处理单元 @@ -52,6 +53,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler { @@ -22,6 +23,7 @@ public class ModifyMyInfoHandler extends IMHandler { mSensitiveType = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Filter_Type)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } try { mBlacklistStrategy = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Strategy)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index a9b2eed2..952ab0fd 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -138,30 +138,35 @@ public class MemoryMessagesStore implements IMessagesStore { mDisableStrangerChat = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Disable_Stranger_Chat)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } try { mFriendRequestDuration = Long.parseLong(m_Server.getConfig().getProperty(FRIEND_Repeat_Request_Duration)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } try { mFriendRejectDuration = Long.parseLong(m_Server.getConfig().getProperty(FRIEND_Reject_Request_Duration)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } try { mChatroomRejoinWhenActive = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Rejoin_When_Active)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } try { mChatroomParticipantIdleTime = Long.parseLong(m_Server.getConfig().getProperty(CHATROOM_Participant_Idle_Time, "900000")); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } @@ -1545,6 +1550,7 @@ public class MemoryMessagesStore implements IMessagesStore { databaseStore.updateUser(us); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } mUserMap.put(userId, us); } @@ -2296,6 +2302,7 @@ public class MemoryMessagesStore implements IMessagesStore { } } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } @@ -2506,6 +2513,7 @@ public class MemoryMessagesStore implements IMessagesStore { newInfoBuilder.setAutomatic(Integer.parseInt(value)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } diff --git a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java index ac88d27f..080d189c 100755 --- a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java @@ -29,6 +29,7 @@ import io.moquette.spi.IMessagesStore.StoredMessage; import io.netty.handler.codec.mqtt.MqttVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import win.liyufan.im.Utility; import java.util.*; import java.util.concurrent.*; @@ -272,6 +273,7 @@ public class MemorySessionStore implements ISessionsStore { supportMultiEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_ENDPOINT)); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } } diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index c791646c..b06bfaf3 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -87,6 +87,7 @@ public class MessagesPublisher { Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } chatroomScheduler.shutdown(); } diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java index 19806b42..9c55965b 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java @@ -187,6 +187,7 @@ public class Qos1PublishHandler extends QosPublishHandler { gzip.close(); } catch (Exception e) { e.printStackTrace(); + Utility.printExecption(LOG, e); } data = out.toByteArray(); code = (byte)ErrorCode.ERROR_CODE_SUCCESS_GZIPED.code;