fix: use redis cache if redis env var is set

powerhouse-inc · May 3, 2024 · ad539ed · ad539ed
1 parent 079e8d7
commit ad539ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/api/src/graphql/server/index.ts b/api/src/graphql/server/index.ts
@@ -15,6 +15,7 @@ import { getChildLogger } from '../../logger';
 import "express-async-errors";
 import { errorHandler } from '../../middleware/errors';
 import * as Sentry from "@sentry/node";
+import { initRedis } from '../../redis';
 const logger = getChildLogger({ msgPrefix: 'SERVER' });
 
 function loggerPlugin(): ApolloServerPlugin<Context> {
@@ -55,6 +56,10 @@ export const startServer = async (
   await apolloIndex.start();
   await apolloDrive.start();
 
+  if (process.env.REDIS_TLS_URL) {
+    await initRedis()
+  }
+
   router.use(
     '/drives',
     cors<cors.CorsRequest>(),
@@ -81,7 +86,7 @@ export const startServer = async (
   if (process.env.SENTRY_DSN) {
     app.use(Sentry.Handlers.errorHandler());
   }
-  
+
   const httpServer = createHttpServer(app);
   return httpServer.listen({ port: PORT }, () => {
     logger.info(`Running on ${PORT}`);

diff --git a/api/src/modules/document/model.ts b/api/src/modules/document/model.ts
@@ -16,17 +16,15 @@ import {
   Listener,
   ListenerFilter,
   actions,
-  DocumentDriveState,
   DocumentDriveAction
 } from 'document-model-libs/document-drive';
 import RedisCache from 'document-drive/cache/redis';
 import MemoryCache from 'document-drive/cache/memory';
-import { RedisClientType, createClient } from 'redis';
 
 import { init } from './listenerManager';
 import { getChildLogger } from '../../logger';
 import DocumentDriveError from '../../errors/DocumentDriveError';
-import { getRedisClient } from '../../redis';
+import { redisClient } from '../../redis';
 
 const logger = getChildLogger({ msgPrefix: 'Document Model' });
 
@@ -50,21 +48,11 @@ export function getDocumentDriveCRUD(prisma: Prisma.TransactionClient) {
 
 
   let driveServer: DocumentDriveServer;
-  // getRedisClient().then((redisClient) => {
-  //   driveServer = new DocumentDriveServer(
-  //     documentModels,
-  //     new PrismaStorage(prisma as PrismaClient),
-  //     redisClient ? new RedisCache(redisClient as RedisClientType) : new MemoryCache(),
-  //   );
-  // }).catch((e) => {
-
-  // }).finally(() => {
-  //   initialize();
-  // })
 
   driveServer = new DocumentDriveServer(
     documentModels,
-    new PrismaStorage(prisma as PrismaClient)
+    new PrismaStorage(prisma as PrismaClient),
+    redisClient ? new RedisCache(redisClient) : new MemoryCache()
   );
 
   initialize();

diff --git a/api/src/redis.ts b/api/src/redis.ts
@@ -3,7 +3,7 @@ import { createClient, RedisClientType } from 'redis';
 
 export let redisClient: RedisClientType | null = null;
 
-export const getRedisClient = async () => {
+export const initRedis = async () => {
   if (!redisClient) {
     redisClient = await createClient({
       url: process.env.REDIS_TLS_URL,