Fix: close cache redis connection on alarm job

pustovitDmytro · Aug 9, 2022 · 4fd15b0 · 4fd15b0
1 parent 0407988
commit 4fd15b0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/.env.defaults b/.env.defaults
@@ -46,7 +46,7 @@ SEND_ALARM_QUEUE_TTL='15s'
 SEND_ALARM_QUEUE_ATTEMPTS=2
 SEND_ALARM_QUEUE_BACKOFF_TYPE=exponential
 SEND_ALARM_QUEUE_BACKOFF_DELAY='5s'
-SEND_ALARM_QUEUE_CONCURRENCY=2
+SEND_ALARM_QUEUE_CONCURRENCY=1
 SEND_ALARM_QUEUE_LOG_LEVEL=info
 SEND_ALARM_QUEUE_PROCESS=true
 SEND_ALARM_QUEUE_KEEP_LAST=0

diff --git a/src/Cache.js b/src/Cache.js
@@ -28,14 +28,24 @@ export default class Cache {
 
     async connect() {
         if (this.connected) return;
-        await this.client.connect();
+
+        try {
+            await this.client.connect();
+        } catch (error) {
+            if (error.message !== 'Socket already opened') throw error;
+        }
+
         this.connected = true;
     }
 
     async close() {
         if (!this.connected) return;
+        try {
+            await this.client.quit();
+        } catch (error) {
+            if (![ 'The client is closed', 'This socket has been ended by the other party' ].includes(error.message)) throw error;
+        }
 
-        await this.client.quit();
         this.connected = false;
     }
 
@@ -48,11 +58,7 @@ export default class Cache {
             chain = chain.SETEX(`${this.prefix}${key}`, this.ttl, cachedValue);
         }
 
-        const res = await chain.exec();
-
-        await this.close();
-
-        return res;
+        return chain.exec();
     }
 
     async areAllSaved(keys) {
@@ -66,8 +72,6 @@ export default class Cache {
 
         const res = await chain.exec();
 
-        await this.close();
-
         return res.every(r => r === cachedValue);
     }
 }

diff --git a/src/workers/sendEarnAlarm.js b/src/workers/sendEarnAlarm.js
@@ -29,5 +29,7 @@ export default async function (job) {
     await cache.saveAll(hashes);
     pn.progress(1, 'Saved in cache');
 
+    await cache.close();
+
     return { status: 'NOTIFIED' };
 }
diff --git a/src/workers/sendP2PAlarm.js b/src/workers/sendP2PAlarm.js
@@ -28,6 +28,7 @@ export default async function (job) {
 
     await cache.saveAll(hashes);
     pn.progress(1, 'Saved in cache');
+    await cache.close();
 
     return { status: 'NOTIFIED' };
 }
diff --git a/src/workers/sendSpotAlarm.js b/src/workers/sendSpotAlarm.js
@@ -28,6 +28,7 @@ export default async function (job) {
 
     await cache.saveAll(hashes);
     pn.progress(1, 'Saved in cache');
+    await cache.close();
 
     return { status: 'NOTIFIED' };
 }