add allPools

main.js

@@ -62,6 +62,7 @@ class Pool {
 
 let playingPool = new Pool({ timeoutLogPrefix: "With timeout, user is seen as had left the game: ", timeoutMs: config.match.longestMatchTime });
 let pendingPool = new Pool({ timeoutLogPrefix: "Pending room expired for user: ", timeoutMs: 600000 });
+const allPools = [playingPool, pendingPool];
 let playerOpponents = new Map();
 let predictedEntertainTime = 600, predictedAthleticTime = 600;
 let entertainRequestCountInTime = 0, athleticRequestCountInTime = 0;
@@ -71,18 +72,17 @@ let localLog = function (content) {
 };
 
 let clearUserPools = function(user) {
-    let removedFromPlaying = false;
-    let removedFromPending = false;
+    let removed = false;
     let toClear = [user];
     let seen = new Set();
     while (toClear.length > 0) {
         let currentUser = toClear.pop();
         if (!currentUser || seen.has(currentUser)) continue;
         seen.add(currentUser);
-        let playingRemoval = playingPool.delete(currentUser);
-        let pendingRemoval = pendingPool.delete(currentUser);
-        if (playingRemoval !== null) removedFromPlaying = true;
-        if (pendingRemoval !== null) removedFromPending = true;
+        for (let pool of allPools) {
+            let removal = pool.delete(currentUser);
+            if (removal !== null) removed = true;
+        }
         let opponent = playerOpponents.get(currentUser);
         playerOpponents.delete(currentUser);
         if (opponent) {
@@ -90,7 +90,7 @@ let clearUserPools = function(user) {
             toClear.push(opponent);
         }
     }
-    return removedFromPlaying || removedFromPending;
+    return removed;
 };
 
 function parseRequestUrl(req) {
@@ -567,8 +567,9 @@ let endClearResponse = function(query, res) {
             }
         }
     };
-    clearFromPool(playingPool);
-    clearFromPool(pendingPool);
+    for (let pool of allPools) {
+        clearFromPool(pool);
+    }
     res.end(`${count} user cleared.`);
 };