diff --git a/server/service/JobQueue/JobQueueHelper.js b/server/service/JobQueue/JobQueueHelper.js index 99a6430e6..de1e00fb8 100644 --- a/server/service/JobQueue/JobQueueHelper.js +++ b/server/service/JobQueue/JobQueueHelper.js @@ -143,10 +143,11 @@ class JobQueueHelper { }); worker.on("failed", (job, error, prev) => { - this.logger.warn({ - message: `Worker ${queueName} is failed with msg: ${error}`, - service: SERVICE_NAME, - method: "createWorker:failed", + this.logger.error({ + message: `Worker ${queueName} is failed with msg: ${error.message}`, + service: error?.service ?? SERVICE_NAME, + method: error?.method ?? "createWorker:failed", + stack: error?.stack, }); }); @@ -293,13 +294,7 @@ class JobQueueHelper { await job.updateProgress(100); return true; } catch (error) { - this.logger.error({ - message: error.message, - service: error.service ?? SERVICE_NAME, - method: error.method ?? "createJobHandler", - details: `Error processing job ${job.id}: ${error.message}`, - stack: error.stack, - }); + await job.updateProgress(100); throw error; } }; diff --git a/server/service/networkService.js b/server/service/networkService.js index e94ec5367..a023ffadd 100755 --- a/server/service/networkService.js +++ b/server/service/networkService.js @@ -437,12 +437,6 @@ class NetworkService { throw new Error(response.data.message); } } catch (error) { - this.logger.error({ - message: "Error in requestDistributedHttp", - service: this.SERVICE_NAME, - method: "requestDistributedHttp", - stack: error.stack, - }); error.service = this.SERVICE_NAME; error.method = "requestDistributedHttp"; throw error; diff --git a/server/service/statusService.js b/server/service/statusService.js index 79db6c96e..a53552717 100755 --- a/server/service/statusService.js +++ b/server/service/statusService.js @@ -121,10 +121,10 @@ class StatusService { try { const { monitorId, status, code } = networkResponse; const monitor = await this.db.getMonitorById(monitorId); - + // Update running stats this.updateRunningStats({ monitor, networkResponse }); - + // No change in monitor status, return early if (monitor.status === status) return { @@ -134,7 +134,7 @@ class StatusService { code, timestamp: new Date().getTime(), }; - + // Monitor status changed, save prev status and update monitor this.logger.info({ service: this.SERVICE_NAME, @@ -144,11 +144,11 @@ class StatusService { prevStatus: monitor.status, newStatus: status, }); - + const prevStatus = monitor.status; monitor.status = status; await monitor.save(); - + return { monitor, statusChanged: true, @@ -157,12 +157,8 @@ class StatusService { timestamp: new Date().getTime(), }; } catch (error) { - this.logger.error({ - service: this.SERVICE_NAME, - message: error.message, - method: "updateStatus", - stack: error.stack, - }); + error.service = this.SERVICE_NAME; + error.method = "updateStatus"; throw error; } };