delay protected session expiration check after DB init, fixes #2855

zadam · May 17, 2022 · c24c807 · c24c807
1 parent dbb5d02
commit c24c807
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/services/protected_session.js b/src/services/protected_session.js
@@ -3,6 +3,7 @@
 const log = require('./log');
 const dataEncryptionService = require('./data_encryption');
 const options = require("./options");
+const sqlInit = require("./sql_init");
 
 let dataKey = null;
 
@@ -63,17 +64,19 @@ function touchProtectedSession() {
     }
 }
 
-setInterval(() => {
-    const protectedSessionTimeout = options.getOptionInt('protectedSessionTimeout');
-    if (isProtectedSessionAvailable()
-        && lastProtectedSessionOperationDate
-        && Date.now() - lastProtectedSessionOperationDate > protectedSessionTimeout * 1000) {
+sqlInit.dbReady.then(() => {
+    setInterval(() => {
+        const protectedSessionTimeout = options.getOptionInt('protectedSessionTimeout');
+        if (isProtectedSessionAvailable()
+            && lastProtectedSessionOperationDate
+            && Date.now() - lastProtectedSessionOperationDate > protectedSessionTimeout * 1000) {
 
-        resetDataKey();
+            resetDataKey();
 
-        require('./ws').reloadFrontend();
-    }
-}, 30000);
+            require('./ws').reloadFrontend();
+        }
+    }, 30000);
+});
 
 
 module.exports = {