Merge pull request #4824 from novuhq/nv-3176-remove-old-instance-from…

…-codebase feat(infra): decommission old instance of redis cluster
novuhq · Nov 13, 2023 · 1ee9d09 · 1ee9d09 · github-actions · Nov 13, 2023
2 parents 3fd2bd2 + df43d80
commit 1ee9d09
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 1,128 deletions.
diff --git a/apps/worker/src/app/workflow/services/cold-start.service.ts b/apps/worker/src/app/workflow/services/cold-start.service.ts
@@ -2,28 +2,15 @@ import { INestApplication } from '@nestjs/common';
 import { INovuWorker, ReadinessService } from '@novu/application-generic';
 
 import { StandardWorker } from './standard.worker';
-import { WorkflowWorker } from './workflow.worker';
-import { OldInstanceStandardWorker } from './old-instance-standard.worker';
-import { OldInstanceWorkflowWorker } from './old-instance-workflow.worker';
 import { SubscriberProcessWorker } from './subscriber-process.worker';
+import { WorkflowWorker } from './workflow.worker';
 
-/**
- * TODO: Temporary engage OldInstanceWorkflowWorker while migrating to MemoryDB
- */
 const getWorkers = (app: INestApplication): INovuWorker[] => {
   const standardWorker = app.get(StandardWorker, { strict: false });
   const workflowWorker = app.get(WorkflowWorker, { strict: false });
-  const oldInstanceStandardWorker = app.get(OldInstanceStandardWorker, { strict: false });
-  const oldInstanceWorkflowWorker = app.get(OldInstanceWorkflowWorker, { strict: false });
   const subscriberProcessWorker = app.get(SubscriberProcessWorker, { strict: false });
 
-  const workers: INovuWorker[] = [
-    standardWorker,
-    workflowWorker,
-    oldInstanceStandardWorker,
-    oldInstanceWorkflowWorker,
-    subscriberProcessWorker,
-  ];
+  const workers: INovuWorker[] = [standardWorker, workflowWorker, subscriberProcessWorker];
 
   return workers;
 };

diff --git a/apps/worker/src/app/workflow/services/index.ts b/apps/worker/src/app/workflow/services/index.ts
@@ -2,5 +2,3 @@ export * from './active-jobs-metric.service';
 export * from './completed-jobs-metric.service';
 export * from './standard.worker';
 export * from './workflow.worker';
-export * from './old-instance-standard.worker';
-export * from './old-instance-workflow.worker';
diff --git a/apps/worker/src/app/workflow/services/old-instance-standard.worker.ts b/apps/worker/src/app/workflow/services/old-instance-standard.worker.ts
diff --git a/apps/worker/src/app/workflow/services/old-instance-workflow.worker.ts b/apps/worker/src/app/workflow/services/old-instance-workflow.worker.ts
diff --git a/apps/worker/src/app/workflow/workflow.module.ts b/apps/worker/src/app/workflow/workflow.module.ts
@@ -18,7 +18,6 @@ import {
   GetSubscriberGlobalPreference,
   GetSubscriberTemplatePreference,
   ProcessTenant,
-  OldInstanceBullMqService,
   QueuesModule,
   SelectIntegration,
   SendTestEmail,
@@ -33,14 +32,7 @@ import {
 } from '@novu/application-generic';
 import { JobRepository } from '@novu/dal';
 
-import {
-  ActiveJobsMetricService,
-  CompletedJobsMetricService,
-  StandardWorker,
-  WorkflowWorker,
-  OldInstanceWorkflowWorker,
-  OldInstanceStandardWorker,
-} from './services';
+import { ActiveJobsMetricService, CompletedJobsMetricService, StandardWorker, WorkflowWorker } from './services';
 
 import {
   MessageMatcher,
@@ -123,9 +115,6 @@ const PROVIDERS: Provider[] = [
   StandardWorker,
   WorkflowWorker,
   SubscriberProcessWorker,
-  OldInstanceBullMqService,
-  OldInstanceStandardWorker,
-  OldInstanceWorkflowWorker,
 ];
 
 @Module({

diff --git a/apps/ws/src/socket/services/index.ts b/apps/ws/src/socket/services/index.ts
@@ -1,3 +1 @@
-export { OldInstanceWebSocketsWorker } from './old-instance-web-sockets.worker';
-export { OldInstanceWebSocketsWorkerService } from './old-instance-web-sockets-worker.service';
 export { WebSocketWorker } from './web-socket.worker';