Extract and name to improve legibility

Refs: #1834
PREreview · Sep 4, 2024 · 0db3be5 · 0db3be5
1 parent c734567
commit 0db3be5
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/src/Redis.ts b/src/Redis.ts
@@ -6,30 +6,31 @@ import { DeprecatedEnvVars } from './env.js'
 
 export class DeprecatedLoggerEnv extends Context.Tag('DeprecatedLoggerEnv')<DeprecatedLoggerEnv, L.LoggerEnv>() {}
 
-export const redisLifecycle = Effect.acquireRelease(
+const makeRedis = Effect.gen(function* () {
+  const env = yield* DeprecatedEnvVars
+  const loggerEnv = yield* DeprecatedLoggerEnv
+  const redis = new IoRedis(env.REDIS_URI.href, { commandTimeout: 2 * 1000, enableAutoPipelining: true })
+
+  redis.on('connect', () => L.debug('Redis connected')(loggerEnv)())
+  redis.on('close', () => L.debug('Redis connection closed')(loggerEnv)())
+  redis.on('reconnecting', () => L.info('Redis reconnecting')(loggerEnv)())
+  redis.removeAllListeners('error')
+  redis.on('error', (error: Error) => L.errorP('Redis connection error')({ error: error.message })(loggerEnv)())
+
+  return redis
+})
+
+const teardownRedis = (redis: IoRedis) =>
   Effect.gen(function* () {
-    const env = yield* DeprecatedEnvVars
     const loggerEnv = yield* DeprecatedLoggerEnv
-    const redis = new IoRedis(env.REDIS_URI.href, { commandTimeout: 2 * 1000, enableAutoPipelining: true })
-
-    redis.on('connect', () => L.debug('Redis connected')(loggerEnv)())
-    redis.on('close', () => L.debug('Redis connection closed')(loggerEnv)())
-    redis.on('reconnecting', () => L.info('Redis reconnecting')(loggerEnv)())
-    redis.removeAllListeners('error')
-    redis.on('error', (error: Error) => L.errorP('Redis connection error')({ error: error.message })(loggerEnv)())
+    yield* Effect.promise(() =>
+      redis
+        .quit()
+        .then(() => L.debug('Redis disconnected')(loggerEnv)())
+        .catch((error: unknown) =>
+          L.warnP('Redis unable to disconnect')({ error: toError(error).message })(loggerEnv)(),
+        ),
+    )
+  })
 
-    return redis
-  }),
-  redis =>
-    Effect.gen(function* () {
-      const loggerEnv = yield* DeprecatedLoggerEnv
-      yield* Effect.promise(() =>
-        redis
-          .quit()
-          .then(() => L.debug('Redis disconnected')(loggerEnv)())
-          .catch((error: unknown) =>
-            L.warnP('Redis unable to disconnect')({ error: toError(error).message })(loggerEnv)(),
-          ),
-      )
-    }),
-)
+export const redisLifecycle = Effect.acquireRelease(makeRedis, teardownRedis)