Merge pull request #4514 from novuhq/fix-self-hosted-metrics-services…

…-shutdown fix(worker): self hosted metrics services were not shutdown properly
novuhq · Oct 16, 2023 · f612e91 · f612e91
2 parents 26ffab9 + 72cbb3f
commit f612e91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/apps/worker/src/app/workflow/services/active-jobs-metric.service.ts b/apps/worker/src/app/workflow/services/active-jobs-metric.service.ts
@@ -120,8 +120,12 @@ export class ActiveJobsMetricService {
   public async gracefulShutdown(): Promise<void> {
     Logger.log('Shutting the Active Jobs Metric service down', LOG_CONTEXT);
 
-    await this.activeJobsMetricQueueService.gracefulShutdown();
-    await this.activeJobsMetricWorkerService.gracefulShutdown();
+    if (this.activeJobsMetricQueueService) {
+      await this.activeJobsMetricQueueService.gracefulShutdown();
+    }
+    if (this.activeJobsMetricWorkerService) {
+      await this.activeJobsMetricWorkerService.gracefulShutdown();
+    }
 
     Logger.log('Shutting down the Active Jobs Metric service has finished', LOG_CONTEXT);
   }

diff --git a/apps/worker/src/app/workflow/services/completed-jobs-metric.service.ts b/apps/worker/src/app/workflow/services/completed-jobs-metric.service.ts
@@ -121,8 +121,12 @@ export class CompletedJobsMetricService {
   public async gracefulShutdown(): Promise<void> {
     Logger.log('Shutting the Completed Jobs Metric service down', LOG_CONTEXT);
 
-    await this.completedJobsMetricQueueService.gracefulShutdown();
-    await this.completedJobsMetricWorkerService.gracefulShutdown();
+    if (this.completedJobsMetricQueueService) {
+      await this.completedJobsMetricQueueService.gracefulShutdown();
+    }
+    if (this.completedJobsMetricWorkerService) {
+      await this.completedJobsMetricWorkerService.gracefulShutdown();
+    }
 
     Logger.log('Shutting down the Completed Jobs Metric service has finished', LOG_CONTEXT);
   }