refactor

Author: Gennaro Del Sorbo

Application/Logger.js

@@ -7,7 +7,7 @@ const cluster = require("cluster")
 
 let logger
 
-function newLogger(enableConsoleLogging, loggerLevel, enableFileLogger, fileLoggerPath) {
+let newLogger = (enableConsoleLogging, loggerLevel, enableFileLogger, fileLoggerPath) => {
     return new Promise(resolve => {
 
         logger = new (winston.Logger)({

Application/Utils.js

@@ -1,9 +1,13 @@
-function Utils(){}
+"use strict"
 
-Utils.prototype.coalesce = function(obj, other){
-    if(!(obj === null) && !(obj === undefined))
-        return obj;
-    return other;
-};
+class Utils {
+    constructor() {}
+    
+    coalesce(obj, other) {
+        if(!(obj === null) && !(obj === undefined))
+            return obj;
+        return other;
+    }
+}
 
 module.exports = new Utils();

Application/Worker.js

@@ -1,78 +1,62 @@
-var jobService = require("../Services/JobService");
-var cluster = require("cluster");
-var jobs = require("./Jobs");
-var ReadWriteLock  = require("rwlock");
-var queueLock = new ReadWriteLock();
-var progressLock = new ReadWriteLock();
-var Logger = require("./Logger");
-var variables = require("./CommonVariables");
+"use strict"
 
-function Worker(worker){
-    this.worker = worker;
-    
-    worker.on('message', function(message) {
-        if(message.err != undefined){
-            jobService.error(message.id, message.err);
-            return;
-        }
-        
-        Logger.instance().debug("master received completed notify for jobId %d", message.id);
-        jobService.done(message.id);
-    });
+const jobService = require("../Services/JobService")
+const cluster = require("cluster")
+const jobs = require("./Jobs")
+const Logger = require("./Logger")
+const variables = require("./CommonVariables")
+
+class Worker {
+    constructor(worker) {
+        this.worker = worker
+
+        worker.on('message', message => {
+            if (message.err) {
+                jobService.error(message.id, message.err)
+                return
+            }
+
+            Logger.instance().debug("master received completed notify for jobId %d", message.id)
+            jobService.done(message.id)
+        })
+    }
 }
 
-var queue = [];
-var inProgress = false;
+let queue = []
 
-if(cluster.isWorker) {
-    Logger.new(process.env[variables.consoleLogger] === "true", process.env[variables.loggerLevel],
-        process.env[variables.fileLogger] === "true", process.env[variables.fileLoggerPath]).then(function(log){
-        log.info("worker %d registered", process.pid);
-    });
-    
-    process.on('message', function(job) { 
-        Logger.instance().debug("job %d received", job.id);
-        queueLock.writeLock(function(release){
-            queue.push(function() { return jobs.executeJob(job) });
-            release();
-        });
-        tryProcessQueue(inProgress);
-    });
+function *getFromQueue() {
+    while(queue.length > 0)
+        yield queue.shift()
 }
 
-function tryProcessQueue(isInProgress){
-    var mustStop = false;
-    progressLock.writeLock(function(release){
-        if(isInProgress)
-            mustStop = true;
-        inProgress = true;
-        release();
-    });
-    
-    if(mustStop)
-        return;
+let q = getFromQueue();
+
+let processQueue = () => {
+    let job = q.next().value
+    if(!job) {
+        q = getFromQueue();
+        return processQueue();
+    }
 
-    var job;
-    queueLock.writeLock(function(release){
-        job = queue.shift();
-        release();
-    });
-    job().then(function(){
-        tryContinueProcess();
-    }).catch(function(err){
-        tryContinueProcess();
-    });
+    job().then(() => {
+        processQueue() 
+    }).catch(() => {
+        processQueue()
+    }) 
 }
 
-function tryContinueProcess(){
-    if(queue.length > 0)
-        tryProcessQueue(false);
-    else {
-        progressLock.writeLock(function(release){
-            inProgress = false;
-            release();
-        });
-    }
+if (cluster.isWorker) {
+    Logger.new(process.env[variables.consoleLogger] === "true", process.env[variables.loggerLevel],
+        process.env[variables.fileLogger] === "true", process.env[variables.fileLoggerPath]).then(log => {
+            log.info("worker %d registered", process.pid)
+        })
+
+    process.on('message', job => {
+        Logger.instance().debug("job %d received", job.id)
+        queue.push(() => { return jobs.executeJob(job) })
+    })
+    
+    processQueue()
 }
 
-module.exports = Worker;
+module.exports = Worker

Test/Services/PartitionServiceTest.js

@@ -47,7 +47,7 @@ describe("PartitionService tests", function(){
       exceptionThrown.should.be.exactly(true);
    });
 
-   it("PartitionService parameter mist be greater than 0", function(){
+   it("PartitionService parameter must be greater than 0", function(){
       var exceptionThrown = false;
 
       try {

Test/partitionerTest.js

@@ -1,8 +1,8 @@
-var mkdirp = function(path, callback){
+var mkdirp = function (path, callback) {
     callback();
 };
 var proxyquire = require("proxyquire");
-proxyquire("../Application/Logger", {'mkdirp': mkdirp});
+proxyquire("../Application/Logger", { 'mkdirp': mkdirp });
 
 var sinon = require("sinon");
 var should = require("should");
@@ -12,22 +12,22 @@ var util = require("util");
 
 process.setMaxListeners(0);
 
-describe("Partitioner", function() {
-    
+describe("Partitioner", function () {
+
     var forkStub;
-    
-    beforeEach(function() {
+
+    beforeEach(function () {
         var workerObj = {
-            on: function(){}
+            on: function () { }
         };
-        forkStub = sinon.stub(cluster, "fork").returns(workerObj);    
+        forkStub = sinon.stub(cluster, "fork").returns(workerObj);
     });
-    
-    afterEach(function() {
-       forkStub.restore(); 
+
+    afterEach(function () {
+        forkStub.restore();
     });
-    
-    describe("Configuration", function(){
+
+    describe("Configuration", function () {
 
         it("if configuration is undefined, then instantiate 1 worker", function(done){
 
@@ -183,13 +183,13 @@ describe("Partitioner", function() {
             }, 200);
         });
 
-        it("if consoleLogger is false then console logger is disabled", function(done){
+        it("if consoleLogger is false then console logger is disabled", function (done) {
             cluster.isWorker = false;
             var partitioner = new Partitioner({
                 consoleLogger: false
             });
 
-            setTimeout(function() {
+            setTimeout(function () {
                 var logger = require("../Application/Logger").instance();
                 should.not.exists(logger.transports.console);
                 done();
@@ -215,7 +215,7 @@ describe("Partitioner", function() {
             cluster.isWorker = false;
             var partitioner = new Partitioner();
 
-            setTimeout(function() {
+               setTimeout(function() {
                 var logger = require("../Application/Logger").instance();
                 should.exists(logger.transports.file);
                 done();