logger fixed for childrenù

Author: jd78

Application/Jobs.js

@@ -7,8 +7,8 @@ function Jobs(){}
 
 Jobs.prototype.executeJob = function(job) {
     var self = this;
-    logger.debug("executing job id: %d, partitionId: %d, type: %s", job.id, job.partitionId, job.type);
     return q.Promise(function(resolve, reject){
+        logger.debug("executing job id: %d, partitionId: %d, type: %s", job.id, job.partitionId, job.type);
         if(self[job.type] === undefined) {
             var err = util.format("the job type %s is not defined", job.type);
             logger.error(err);
@@ -17,6 +17,7 @@ Jobs.prototype.executeJob = function(job) {
         }
 
         self[job.type](job).then(function(){
+            console.log("job exexuted");
             process.send(new Message(job.id));
             resolve();
         }).catch(function(err) {

Application/Worker.js

@@ -12,16 +12,20 @@ function Worker(worker){
             return;
         }
 
-        logger.log("complete notify received for id " + message.id);
+        logger.debug("complete notify received for id %d", message.id);
         jobService.done(message.id);
     });
 }
 
 if(cluster.isWorker) {
+    logger.transports.file.level = process.env["loggerLevel"];
+    logger.transports.console.level = process.env["loggerLevel"];
+    
     logger.info("worker %d registered", process.pid);
     process.on('message', function(job) { 
-        logger.log("job " + job.id + " received");
-        jobs.executeJob(job).then(function(){});
+        logger.debug("job %d received", job.id);
+        jobs.executeJob(job).then(function(){
+        });
     });
 }
 

Partitioner.js

@@ -27,15 +27,21 @@ function Partitioner(configuration) {
     var config = configuration !== undefined ? configuration : defaultConfiguration;
     numberOfWorkers = config.numberOfWorkers || 1;
     this.partitionService = new PartitionService(config.cleanIdlePartitionsAfterMinutes || 15);
+    
+    var processEnv = {};
     if(config.loggerLevel !== undefined){
         logger.transports.file.level = config.loggerLevel;
+        logger.transports.console.level = config.loggerLevel;
+        processEnv["loggerLevel"] = config.loggerLevel;
+    }else {
+        processEnv["loggerLevel"] = defaultConfiguration.loggerLevel;
     }
 
     if(cluster.isWorker)
         throw new Error("a worker is trying to instantiate a partitioner");
 
     for(var i=0; i < numberOfWorkers; i++){
-        workers.push(new Worker(cluster.fork()));
+        workers.push(new Worker(cluster.fork(processEnv)));
     }
 }
 

Samples/test-redis.js

@@ -25,11 +25,13 @@ if(cluster.isWorker) {
     registerJob('sequential', function(job) {
         return q.Promise(function(resolve) {
             console.log("slow in-sequence job started. Id: %d, Partition: %d, pid: %d, sequence: %d", job.id, job.partitionId, process.pid, job.data.sequence);
-            for(var i=0; i<999999999; i++){
+            // for(var i=0; i<999999999; i++){
 
-            }
-            console.log("slow in-sequence job completed. Id: %d, Partition: %d, pid: %d, sequence: %d", job.id, job.partitionId, process.pid, job.data.sequence);
-            resolve();
+            // }
+            setTimeout(function(){
+                console.log("slow in-sequence job completed. Id: %d, Partition: %d, pid: %d, sequence: %d", job.id, job.partitionId, process.pid, job.data.sequence);
+                resolve();    
+            }, 5000);
         });
     });
 }
@@ -48,21 +50,22 @@ if(cluster.isMaster) {
         });
     }
 
-    for (var i = 0; i < 20; i++) {
-        queue.create('jobs', {
-            partitionId: i % 5,
-            type: "test"
-        }).save(function(err) {
-            if (err) console.log(err);
-        });
-    }
+    // for (var i = 0; i < 20; i++) {
+    //     queue.create('jobs', {
+    //         partitionId: i % 5,
+    //         type: "test"
+    //     }).save(function(err) {
+    //         if (err) console.log(err);
+    //     });
+    // }
 
     start();
 }
 
 function start(){
     var partitioner = new Partitioner({
-        numberOfWorkers: 4
+        numberOfWorkers: 4,
+        loggerLevel: 'debug'
     });
 
     setTimeout(function(){
@@ -77,7 +80,7 @@ function start(){
                     data: { }
                 }, function(err){
                     if(err === undefined){
-                        console.log("test job %d done", id);
+                        console.log("test job %d done", job.id);
                         done();
                     }else{
                         console.log(err);
@@ -95,7 +98,7 @@ function start(){
                     }
                 }, function(err){
                     if(err === undefined){
-                        console.log("sequential job %d done", id);
+                        console.log("sequential job %d done", job.id);
                         done();
                     }else{
                         console.log(err);