diff --git a/Server/service/jobQueue.js b/Server/service/jobQueue.js index 419785540..f7c70f0a7 100644 --- a/Server/service/jobQueue.js +++ b/Server/service/jobQueue.js @@ -1,4 +1,4 @@ -const QUEUE_NAMES = ["uptime", "pagespeed", "hardware"]; +const QUEUE_NAMES = ["uptime", "pagespeed", "hardware", "distributed"]; const SERVICE_NAME = "JobQueue"; const JOBS_PER_WORKER = 5; const QUEUE_LOOKUP = { @@ -8,6 +8,7 @@ const QUEUE_LOOKUP = { port: "uptime", docker: "uptime", pagespeed: "pagespeed", + distributed_http: "distributed", }; const getSchedulerId = (monitor) => `scheduler:${monitor.type}:${monitor._id}`; @@ -163,6 +164,9 @@ class NewJobQueue { // Get the current status await job.updateProgress(30); const networkResponse = await this.networkService.getStatus(job); + if (job.data.type === "distributed_http") { + return; + } // Handle status change await job.updateProgress(60); const { monitor, statusChanged, prevStatus } = @@ -219,51 +223,6 @@ class NewJobQueue { connection: this.connection, concurrency: 5, }); - - // worker.on("active", (job) => { - // this.logger.info({ - // message: `Worker started processing job: ${job.id}`, - // service: SERVICE_NAME, - // method: "createWorker", - // }); - // }); - - // worker.on("completed", (job) => { - // this.logger.info({ - // message: `Worker completed job: ${job.id}`, - // service: SERVICE_NAME, - // method: "createWorker", - // }); - // }); - - // // Log job progress updates - // worker.on("progress", (job, progress) => { - // this.logger.info({ - // message: `Job progress: ${job.id}`, - // service: SERVICE_NAME, - // method: "createWorker", - // details: `Progress: ${progress}%`, - // }); - // }); - - // // Log when a job fails - // worker.on("failed", (job, err) => { - // this.logger.error({ - // message: `Worker failed job: ${job.id}`, - // service: SERVICE_NAME, - // method: "createWorker", - // details: `Error: ${err.message}`, - // stack: err.stack, - // }); - // }); - - // worker.on("stalled", (jobId) => { - // this.logger.warn({ - // message: `Worker stalled job: ${jobId}`, - // service: SERVICE_NAME, - // method: "createWorker", - // }); - // }); return worker; } @@ -392,7 +351,6 @@ class NewJobQueue { const jobs = await queue.getJobs(); const ret = await Promise.all( jobs.map(async (job) => { - console.log(job); const state = await job.getState(); return { url: job.data.url, state, progress: job.progress }; })