Added some comments and timeouts info

Author: JayDi85

Mage.Server/src/main/java/mage/server/UserManager.java

@@ -1,18 +1,18 @@
-
 package mage.server;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 import mage.server.User.UserState;
 import mage.server.record.UserStats;
 import mage.server.record.UserStatsRepository;
 import mage.server.util.ThreadExecutor;
 import mage.view.UserView;
 import org.apache.log4j.Logger;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 /**
  * manages users - if a user is disconnected and 10 minutes have passed with no
  * activity the user is removed
@@ -22,6 +22,9 @@
 public enum UserManager {
     instance;
 
+    private static final int SERVER_TIMEOUTS_USER_DISCONNECT_FROM_SERVER_AFTER_SECS = 3 * 60; // removes from all games and chats too (can be seen in users list with disconnected status)
+    private static final int SERVER_TIMEOUTS_USER_REMOVE_FROM_SERVER_AFTER_SECS = 8 * 60; // removes from users list
+
     private static final Logger logger = Logger.getLogger(UserManager.class);
 
     protected final ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor();
@@ -127,17 +130,17 @@ public void removeUserFromAllTablesAndChat(final UUID userId, final DisconnectRe
         if (userId != null) {
             getUser(userId).ifPresent(user
                     -> USER_EXECUTOR.execute(
-                            () -> {
-                                try {
-                                    logger.info("USER REMOVE - " + user.getName() + " (" + reason.toString() + ")  userId: " + userId + " [" + user.getGameInfo() + ']');
-                                    user.removeUserFromAllTables(reason);
-                                    ChatManager.instance.removeUser(user.getId(), reason);
-                                    logger.debug("USER REMOVE END - " + user.getName());
-                                } catch (Exception ex) {
-                                    handleException(ex);
-                                }
-                            }
-                    ));
+                    () -> {
+                        try {
+                            logger.info("USER REMOVE - " + user.getName() + " (" + reason.toString() + ")  userId: " + userId + " [" + user.getGameInfo() + ']');
+                            user.removeUserFromAllTables(reason);
+                            ChatManager.instance.removeUser(user.getId(), reason);
+                            logger.debug("USER REMOVE END - " + user.getName());
+                        } catch (Exception ex) {
+                            handleException(ex);
+                        }
+                    }
+            ));
 
         }
     }
@@ -155,16 +158,15 @@ public boolean extendUserSession(UUID userId, String pingInfo) {
 
     /**
      * Is the connection lost for more than 3 minutes, the user will be set to
-     * offline status. The user will be removed in validity check after 15
+     * offline status. The user will be removed in validity check after 8
      * minutes of no activities
-     *
      */
     private void checkExpired() {
         try {
             Calendar calendarExp = Calendar.getInstance();
-            calendarExp.add(Calendar.MINUTE, -3);
+            calendarExp.add(Calendar.SECOND, -1 * SERVER_TIMEOUTS_USER_DISCONNECT_FROM_SERVER_AFTER_SECS);
             Calendar calendarRemove = Calendar.getInstance();
-            calendarRemove.add(Calendar.MINUTE, -8);
+            calendarRemove.add(Calendar.SECOND, -1 * SERVER_TIMEOUTS_USER_REMOVE_FROM_SERVER_AFTER_SECS);
             List<User> toRemove = new ArrayList<>();
             logger.debug("Start Check Expired");
             ArrayList<User> userList = new ArrayList<>();
@@ -179,18 +181,18 @@ private void checkExpired() {
                 try {
                     if (user.getUserState() == UserState.Offline) {
                         if (user.isExpired(calendarRemove.getTime())) {
+                            // removes from users list
                             toRemove.add(user);
                         }
                     } else {
                         if (user.isExpired(calendarExp.getTime())) {
+                            // set disconnected status and removes from all activities (tourney/tables/games/drafts/chats)
                             if (user.getUserState() == UserState.Connected) {
                                 user.lostConnection();
                                 disconnect(user.getId(), DisconnectReason.BecameInactive);
                             }
                             removeUserFromAllTablesAndChat(user.getId(), DisconnectReason.SessionExpired);
                             user.setUserState(UserState.Offline);
-                            // Remove the user from all tournaments
-
                         }
                     }
                 } catch (Exception ex) {
@@ -215,7 +217,6 @@ private void checkExpired() {
 
     /**
      * This method recreated the user list that will be send to all clients
-     *
      */
     private void updateUserInfoList() {
         try {

Mage.Server/src/main/java/mage/server/game/GameController.java

@@ -49,6 +49,9 @@
  */
 public class GameController implements GameCallback {
 
+    private static final int GAME_TIMEOUTS_CHECK_JOINING_STATUS_EVERY_SECS = 15; // checks and inform players about joining status
+    private static final int GAME_TIMEOUTS_CANCEL_PLAYER_GAME_JOINING_AFTER_INACTIVE_SECS = 4 * 60; // leave player from game if it don't join and inactive on server
+
     private static final ExecutorService gameExecutor = ThreadExecutor.instance.getGameExecutor();
     private static final Logger logger = Logger.getLogger(GameController.class);
 
@@ -226,7 +229,7 @@ private void init() {
             } catch (Exception ex) {
                 logger.fatal("Send info about player not joined yet:", ex);
             }
-        }, 15, 15, TimeUnit.SECONDS);
+        }, GAME_TIMEOUTS_CHECK_JOINING_STATUS_EVERY_SECS, GAME_TIMEOUTS_CHECK_JOINING_STATUS_EVERY_SECS, TimeUnit.SECONDS);
         checkStart();
     }
 
@@ -320,6 +323,7 @@ private synchronized void startGame() {
     }
 
     private void sendInfoAboutPlayersNotJoinedYet() {
+        // runs every 15 secs untill all players join
         for (Player player : game.getPlayers().values()) {
             if (!player.hasLeft() && player.isHuman()) {
                 Optional<User> requestedUser = getUserByPlayerId(player.getId());
@@ -333,12 +337,12 @@ private void sendInfoAboutPlayersNotJoinedYet() {
                             logger.debug("Player " + player.getName() + " (disconnected) has joined gameId: " + game.getId());
                         }
                         ChatManager.instance.broadcast(chatId, player.getName(), user.getPingInfo() + " is pending to join the game", MessageColor.BLUE, true, ChatMessage.MessageType.STATUS, null);
-                        if (user.getSecondsDisconnected() > 240) {
+                        if (user.getSecondsDisconnected() > GAME_TIMEOUTS_CANCEL_PLAYER_GAME_JOINING_AFTER_INACTIVE_SECS) {
+                            // TODO: 2019.04.22 - if user playing another game on server but not joining (that's the reason?), then that's check will never trigger
                             // Cancel player join possibility lately after 4 minutes
                             logger.debug("Player " + player.getName() + " - canceled game (after 240 seconds) gameId: " + game.getId());
                             player.leave();
                         }
-
                     }
                 } else if (!player.hasLeft()) {
                     logger.debug("Player " + player.getName() + " canceled game (no user) gameId: " + game.getId());