@tryghost/job-manager 0.8.13 → 0.8.17

package/lib/job-manager.js

@@ -3,7 +3,8 @@ const fastq = require('fastq');
 const later = require('@breejs/later');
 const Bree = require('bree');
 const pWaitFor = require('p-wait-for');
-const {IgnitionError, IncorrectUsageError} = require('@tryghost/errors');
+const {UnhandledJobError, IncorrectUsageError} = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
 const isCronExpression = require('./is-cron-expression');
 const assembleBreeJob = require('./assemble-bree-job');
 
@@ -28,11 +29,10 @@ const handler = (error, result) => {
 class JobManager {
     /**
      * @param {Object} options
-     * @param {Object} [options.logging] - custom logging handler, defaults to console
      * @param {Function} [options.errorHandler] - custom job error handler
      * @param {Function} [options.workerMessageHandler] - custom message handler coming from workers
      */
-    constructor({logging, errorHandler, workerMessageHandler}) {
+    constructor({errorHandler, workerMessageHandler}) {
         this.queue = fastq(this, worker, 1);
 
         this.bree = new Bree({
@@ -43,8 +43,6 @@ class JobManager {
             errorHandler: errorHandler,
             workerMessageHandler: workerMessageHandler
         });
-
-        this.logging = logging;
     }
 
     /**
@@ -60,7 +58,7 @@ class JobManager {
      */
     addJob({name, at, job, data, offloaded = true}) {
         if (offloaded) {
-            this.logging.info('Adding offloaded job to the queue');
+            logging.info('Adding offloaded job to the queue');
             let schedule;
 
             if (!name) {
@@ -86,18 +84,18 @@ class JobManager {
                     });
                 }
 
-                this.logging.info(`Scheduling job ${name} at ${at}. Next run on: ${later.schedule(schedule).next()}`);
+                logging.info(`Scheduling job ${name} at ${at}. Next run on: ${later.schedule(schedule).next()}`);
             } else if (at !== undefined) {
-                this.logging.info(`Scheduling job ${name} at ${at}`);
+                logging.info(`Scheduling job ${name} at ${at}`);
             } else {
-                this.logging.info(`Scheduling job ${name} to run immediately`);
+                logging.info(`Scheduling job ${name} to run immediately`);
             }
 
             const breeJob = assembleBreeJob(at, job, data, name);
             this.bree.add(breeJob);
             return this.bree.start(name);
         } else {
-            this.logging.info('Adding one off inline job to the queue');
+            logging.info('Adding one off inline job to the queue');
 
             this.queue.push(async () => {
                 try {
@@ -109,10 +107,7 @@ class JobManager {
                 } catch (err) {
                     // NOTE: each job should be written in a safe way and handle all errors internally
                     //       if the error is caught here jobs implementaton should be changed
-                    this.logging.error(new IgnitionError({
-                        level: 'critical',
-                        errorType: 'UnhandledJobError',
-                        message: 'Processed job threw an unhandled error',
+                    logging.error(new UnhandledJobError({
                         context: (typeof job === 'function') ? 'function' : job,
                         err
                     }));
@@ -147,11 +142,11 @@ class JobManager {
             return;
         }
 
-        this.logging.warn('Waiting for busy job queue');
+        logging.warn('Waiting for busy job queue');
 
         await pWaitFor(() => this.queue.idle() === true, options);
 
-        this.logging.warn('Job queue finished');
+        logging.warn('Job queue finished');
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/job-manager",
-  "version": "0.8.13",
+  "version": "0.8.17",
   "repository": "https://github.com/TryGhost/Utils/tree/main/packages/job-manager",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@sinonjs/fake-timers": "8.1.0",
     "c8": "7.10.0",
-    "date-fns": "2.26.0",
+    "date-fns": "2.27.0",
     "delay": "5.0.0",
     "mocha": "9.1.3",
     "should": "13.2.3",
@@ -29,10 +29,11 @@
   },
   "dependencies": {
     "@breejs/later": "^4.0.2",
+    "@tryghost/logging": "^2.0.0",
     "bree": "^6.2.0",
     "cron-validate": "^1.4.3",
     "fastq": "^1.11.0",
     "p-wait-for": "^3.2.0"
   },
-  "gitHead": "c47f18a41c5298f4179fb3073dbf2248de80b0d4"
+  "gitHead": "69f039f26b1b1358ce7f835e5006cb9ae6c5b7ba"
 }