From 98be882bc1d2995e4e3754fe201f3f336075d122 Mon Sep 17 00:00:00 2001 From: Habib Alkhabbaz <31035020+habibalkhabbaz@users.noreply.github.com> Date: Fri, 7 Oct 2022 09:06:08 +0300 Subject: [PATCH] fix: give redlock enough time for locking --- app/helpers/__tests__/cache.test.js | 16 ++++++++-------- app/helpers/cache.js | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/helpers/__tests__/cache.test.js b/app/helpers/__tests__/cache.test.js index 3448f997..acfedc6c 100644 --- a/app/helpers/__tests__/cache.test.js +++ b/app/helpers/__tests__/cache.test.js @@ -74,7 +74,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 1000); }); it('does not trigger setex', () => { @@ -100,7 +100,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 1000); }); it('triggers setex', () => { @@ -147,7 +147,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 1000); }); it('triggers get', () => { @@ -228,7 +228,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key', 1000); }); it('triggers del', () => { @@ -270,7 +270,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 1000); }); it('triggers set', () => { @@ -311,7 +311,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 1000); }); it('triggers setex', () => { @@ -357,7 +357,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 1000); }); it('triggers get', () => { @@ -566,7 +566,7 @@ describe('cache', () => { }); it('triggers lock', () => { - expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 500); + expect(mockLock).toHaveBeenCalledWith('redlock:my-key:my-field', 1000); }); it('triggers del', () => { diff --git a/app/helpers/cache.js b/app/helpers/cache.js index 45d3b9fc..abf34671 100644 --- a/app/helpers/cache.js +++ b/app/helpers/cache.js @@ -43,7 +43,7 @@ const keys = async pattern => redis.keys(pattern); * @param {*} ttl seconds */ const set = async (key, value, ttl = undefined) => { - const lock = await redlock.lock(`redlock:${key}`, 500); + const lock = await redlock.lock(`redlock:${key}`, 1000); let result; if (ttl) { @@ -63,7 +63,7 @@ const set = async (key, value, ttl = undefined) => { * @param {*} key */ const get = async key => { - const lock = await redlock.lock(`redlock:${key}`, 500); + const lock = await redlock.lock(`redlock:${key}`, 1000); const result = await redis.get(key); await lock.unlock(); @@ -93,7 +93,7 @@ const getWithTTL = async key => redis.multi().ttl(key).get(key).exec(); * @param {*} key */ const del = async key => { - const lock = await redlock.lock(`redlock:${key}`, 500); + const lock = await redlock.lock(`redlock:${key}`, 1000); const result = await redis.del(key); await lock.unlock(); return result;