Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Changed some server logging.

Browse source
This commit is contained in:
LevelX2 2013-10-19 18:40:46 +02:00
parent c22a75a6c3
commit 038b15f399
10 changed files with 89 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,12 +90,11 @@ public class Session {
if (user.getHost().equals(host)) {
if (user.getSessionId().isEmpty()) {
logger.info("Reconnecting session for " + userName);
}
else {
} else {
//throw new MageException("This machine is already connected");
//disconnect previous one
logger.info("Disconnecting another user instance: " + userName);
UserManager.getInstance().disconnect(user.getId());
UserManager.getInstance().disconnect(user.getId(), User.DisconnectReason.ConnectingOtherInstance);
}
}
else {
@ -159,13 +158,13 @@ public class Session {
return sessionId;
}
public void disconnect() {
public void userLostConnection() {
logger.info("session disconnected for user " + userId);
UserManager.getInstance().disconnect(userId);
UserManager.getInstance().disconnect(userId, User.DisconnectReason.LostConnection);
}
public void kill() {
logger.info("session killed for user " + userId);
logger.debug("session removed for user " + userId);
UserManager.getInstance().removeUser(userId, User.DisconnectReason.Disconnected);
}
@ -175,7 +174,7 @@ public class Session {
callbackHandler.handleCallbackOneway(new Callback(call));
} catch (HandleCallbackException ex) {
logger.fatal(new StringBuilder("Session of userId ").append(userId).append(" fireCallback error: ").append(ex.getMessage()).toString(), ex);
disconnect();
userLostConnection();
}
}