Fix gateway backups (#568)

* Fix gateway backups * Not querying backup if instance is not connected to Gateway
GladysAssistant · Oct 22, 2019 · 5d5ce90 · 5d5ce90
1 parent fcba3d2
commit 5d5ce90
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 28 deletions.
diff --git a/server/config/scheduler-jobs.js b/server/config/scheduler-jobs.js
@@ -3,7 +3,7 @@ const { EVENTS } = require('../utils/constants');
 const jobs = [
   {
     name: 'backup-gateway',
-    frequencyInSeconds: 24 * 60 * 60,
+    frequencyInSeconds: 2 * 60 * 60, // we check every 2 hour if needed, but it will backup only once a day
     event: EVENTS.GATEWAY.CREATE_BACKUP,
   },
   {

diff --git a/server/lib/gateway/gateway.checkIfBackupNeeded.js b/server/lib/gateway/gateway.checkIfBackupNeeded.js
@@ -0,0 +1,33 @@
+const logger = require('../../utils/logger');
+/**
+ * @description Check if a backup is needed
+ * @example
+ * checkIfBackupNeeded();
+ */
+async function checkIfBackupNeeded() {
+  if (!this.connected) {
+    logger.info(`Instance not connected to Gladys Gateway, not backing up.`);
+    return;
+  }
+  const backups = await this.getBackups();
+  let shouldBackup = false;
+  if (backups.length === 0) {
+    shouldBackup = true;
+  } else {
+    const lastBackupTimestamp = new Date(backups[0].created_at).getTime();
+    const yesterday = new Date().getTime() - 24 * 60 * 60 * 1000;
+    if (lastBackupTimestamp <= yesterday) {
+      shouldBackup = true;
+    }
+  }
+  if (shouldBackup) {
+    logger.info(`Trying to backup instance to Gladys Gateway`);
+    await this.backup();
+  } else {
+    logger.info(`Not backing up instance to Gladys Gateway, last backup is recent.`);
+  }
+}
+
+module.exports = {
+  checkIfBackupNeeded,
+};
diff --git a/server/lib/gateway/gateway.init.js b/server/lib/gateway/gateway.init.js
@@ -1,4 +1,5 @@
 const logger = require('../../utils/logger');
+const { EVENTS } = require('../../utils/constants');
 
 /**
  * @description Init Gladys Gateway.
@@ -19,6 +20,8 @@ async function init() {
         this.handleNewMessage.bind(this),
       );
       this.connected = true;
+      // try to backup, if needed
+      this.event.emit(EVENTS.GATEWAY.CREATE_BACKUP);
     }
   } catch (e) {
     logger.debug(e);
@@ -31,32 +34,6 @@ async function init() {
     } catch (e) {
       logger.debug(e);
     }
-
-    if (!this.connected) {
-      return;
-    }
-
-    try {
-      const backups = await this.getBackups();
-      let shouldBackup = false;
-      if (backups.length === 0) {
-        shouldBackup = true;
-      } else {
-        const lastBackupTimestamp = new Date(backups[0].created_at).getTime();
-        const yesterday = new Date().getTime() - 24 * 60 * 60 * 1000;
-        if (lastBackupTimestamp <= yesterday) {
-          shouldBackup = true;
-        }
-      }
-      if (shouldBackup) {
-        logger.debug(`Trying to backup instance to Gladys Gateway`);
-        await this.backup();
-      } else {
-        logger.debug(`Not backing up instance to Gladys Gateway, last backup is recent.`);
-      }
-    } catch (e) {
-      logger.debug(e);
-    }
   }
 }
 

diff --git a/server/lib/gateway/index.js b/server/lib/gateway/index.js
@@ -9,6 +9,7 @@ const serverUrl = getConfig().gladysGatewayServerUrl;
 const cryptoLib = new WebCrypto();
 
 const { backup } = require('./gateway.backup');
+const { checkIfBackupNeeded } = require('./gateway.checkIfBackupNeeded');
 const { handleNewMessage } = require('./gateway.handleNewMessage');
 const { login } = require('./gateway.login');
 const { loginTwoFactor } = require('./gateway.loginTwoFactor');
@@ -36,14 +37,15 @@ const Gateway = function Gateway(variable, event, system, sequelize, config, use
   this.restoreInProgress = false;
   this.GladysGatewayClient = GladysGatewayClient;
   this.gladysGatewayClient = new GladysGatewayClient({ cryptoLib, serverUrl, logger });
-  this.event.on(EVENTS.GATEWAY.CREATE_BACKUP, eventFunctionWrapper(this.backup.bind(this)));
+  this.event.on(EVENTS.GATEWAY.CREATE_BACKUP, eventFunctionWrapper(this.checkIfBackupNeeded.bind(this)));
   this.event.on(EVENTS.GATEWAY.RESTORE_BACKUP, eventFunctionWrapper(this.restoreBackupEvent.bind(this)));
   this.event.on(EVENTS.SYSTEM.CHECK_UPGRADE, eventFunctionWrapper(this.getLatestGladysVersion.bind(this)));
   this.event.on(EVENTS.WEBSOCKET.SEND_ALL, eventFunctionWrapper(this.forwardWebsockets.bind(this)));
   this.event.on(EVENTS.WEBSOCKET.SEND, eventFunctionWrapper(this.forwardWebsockets.bind(this)));
 };
 
 Gateway.prototype.backup = backup;
+Gateway.prototype.checkIfBackupNeeded = checkIfBackupNeeded;
 Gateway.prototype.handleNewMessage = handleNewMessage;
 Gateway.prototype.login = login;
 Gateway.prototype.loginTwoFactor = loginTwoFactor;