Refactor queue handling by removing WorkerNotification and updating j…

…ob configurations in SendReportsToSubscribers
OneUptime · Sep 22, 2024 · 3809b45 · 3809b45
1 parent 9be007c
commit 3809b45
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/Common/Server/Infrastructure/Queue.ts b/Common/Server/Infrastructure/Queue.ts
@@ -14,8 +14,7 @@ import { ExpressRouter } from "../Utils/Express";
 
 export enum QueueName {
   Workflow = "Workflow",
-  Worker = "Worker",
-  WorkerNotification = "WorkerNotification",
+  Worker = "Worker"
 }
 
 export type QueueJob = Job;

diff --git a/Common/Types/Events/Recurring.ts b/Common/Types/Events/Recurring.ts
@@ -81,7 +81,7 @@ export default class Recurring extends DatabaseProperty {
 
     if (nextDate.getTime() <= dateNow.getTime()) {
       while (nextDate.getTime() <= dateNow.getTime()) {
-        nextDate = this.getNextDateInterval(startDate, rotation);
+        nextDate = this.getNextDateInterval(nextDate, rotation);
       }
     }
 

diff --git a/Worker/Jobs/StatusPage/SendReportsToSubscribers.ts b/Worker/Jobs/StatusPage/SendReportsToSubscribers.ts
@@ -7,14 +7,12 @@ import StatusPageService from "Common/Server/Services/StatusPageService";
 import QueryHelper from "Common/Server/Types/Database/QueryHelper";
 import logger from "Common/Server/Utils/Logger";
 import StatusPage from "Common/Models/DatabaseModels/StatusPage";
-import { QueueName } from "Common/Server/Infrastructure/Queue";
 
 RunCron(
   "StatusPage:SendReportToSubscribers",
   {
     schedule: EVERY_MINUTE,
-    runOnStartup: false,
-    queueName: QueueName.WorkerNotification,
+    runOnStartup: false
   },
   async () => {
     // get all scheduled events of all the projects.

diff --git a/Worker/Routes.ts b/Worker/Routes.ts
@@ -133,25 +133,6 @@ const WorkersFeatureSet: FeatureSet = {
         { concurrency: 100 },
       );
 
-      // Job process.
-      QueueWorker.getWorker(
-        QueueName.WorkerNotification,
-        async (job: QueueJob) => {
-          const name: string = job.name;
-
-          logger.debug("Running Job: " + name);
-
-          const funcToRun: PromiseVoidFunction =
-            JobDictionary.getJobFunction(name);
-
-          const timeoutInMs: number = JobDictionary.getTimeoutInMs(name);
-
-          if (funcToRun) {
-            await QueueWorker.runJobWithTimeout(timeoutInMs, funcToRun);
-          }
-        },
-        { concurrency: 100 },
-      );
     } catch (err) {
       logger.error("App Init Failed:");
       logger.error(err);