Merge pull request #1684 from serlo/revert-1669-redis-harderning

Revert "feat: Use the database while trying to reconnect to Redis"
serlo · Jul 18, 2024 · c4992ad · c4992ad
2 parents 1f27bb7 + 30c0f27
commit c4992ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/packages/server/src/cache.ts b/packages/server/src/cache.ts
@@ -5,7 +5,6 @@ import createMsgpack from 'msgpack5'
 import * as R from 'ramda'
 import Redlock from 'redlock'
 
-import { captureErrorEvent } from './error-event'
 import { Priority, Cache, CacheEntry } from '~/context/cache'
 import { timeToMilliseconds, Time, Timer } from '~/timer'
 import { FunctionOrValue, isUpdateFunction } from '~/utils'
@@ -28,22 +27,14 @@ export function createCache({ timer }: { timer: Timer }): Cache {
       if (times * delay > 300_000) throw new Error('Redis connection timed out')
       return delay
     },
-    maxRetriesPerRequest: 3,
-  })
-
-  client.on('error', (error) => {
-    captureErrorEvent({
-      error,
-      location: 'cache',
-    })
   })
 
   const lockManagers: Record<Priority, LockManager> = {
     [Priority.Low]: createLockManager({
       retryCount: 0,
     }),
     [Priority.High]: createLockManager({
-      retryCount: 5,
+      retryCount: 10,
     }),
   }
 
@@ -187,13 +178,6 @@ function createLockManager({
   retryCount: number
 }): LockManager {
   const client = new Redis(process.env.REDIS_URL)
-  client.on('error', (error) => {
-    captureErrorEvent({
-      error,
-      location: 'Cache lockManager',
-    })
-    client.disconnect()
-  })
   const redlock = new Redlock([client], { retryCount })
 
   return {

diff --git a/packages/server/src/cached-resolver.ts b/packages/server/src/cached-resolver.ts
@@ -15,12 +15,7 @@ export function createCachedResolver<P, R>(
     __typename: 'CachedResolver',
     async resolveWithDecoder(customDecoder, payload, context) {
       const key = spec.getKey(payload)
-      const cacheValue = await context.cache
-        .get<R>({ key, maxAge })
-        .catch(() => {
-          // probably we don't have a connection to redis
-          return O.none
-        })
+      const cacheValue = await context.cache.get<R>({ key, maxAge })
 
       if (O.isSome(cacheValue)) {
         const cacheEntry = cacheValue.value
@@ -43,16 +38,13 @@ export function createCachedResolver<P, R>(
       const value = await spec.getCurrentValue(payload, context)
 
       if (customDecoder.is(value)) {
-        await context.cache
-          .set({
-            key,
-            value,
-            source: 'API: From a call to a data source',
-            ttlInSeconds,
-          })
-          .catch(() => {
-            // probably we don't have a connection to redis
-          })
+        await context.cache.set({
+          key,
+          value,
+          source: 'API: From a call to a data source',
+          ttlInSeconds,
+        })
+
         return value
       } else {
         throw new InvalidCurrentValueError({

diff --git a/packages/server/src/internals/swr-queue.ts b/packages/server/src/internals/swr-queue.ts
@@ -64,7 +64,6 @@ export function createSwrQueue({
     isWorker: false,
     removeOnFailure: true,
     removeOnSuccess: true,
-    autoConnect: false,
   })
 
   queue.on('error', (error) => {