Merge pull request #43 from AnyFetch/improved-logging

Log less data for tasks

Author: Hugo Duroux

lib/helpers/hydrater.js

@@ -19,10 +19,7 @@ var HydrationError = lib.HydrationError;
 var logError = require('../utils').logError;
 
 
-
 module.exports = function(hydraterFunction, childs) {
-
-
   /**
    * Handle a hydration task:
    * - Download the file
@@ -35,7 +32,9 @@ module.exports = function(hydraterFunction, childs) {
    */
   return function(job, done) {
     var task = job.data;
-    log.info(task, "Starting task");
+    var loggingTask = {file_path: task.file_path, callback: task.callback, document: {id: task.document.id, identifier: task.document.identifier}};
+
+    log.info(loggingTask, "Starting task");
 
     async.waterfall([
       function performHydration(cb) {
@@ -65,10 +64,12 @@ module.exports = function(hydraterFunction, childs) {
             cb(err, changes);
           }
           if(stdout !== "") {
-            log.info({std: "out"}, stdout);
+            loggingTask.std = "out";
+            log.info(loggingTask, stdout);
           }
           if(stderr !== "") {
-            log.info({std: "err"}, stderr);
+            loggingTask.std = "err";
+            log.info(loggingTask, stderr);
           }
           clearTimeout(timeout);
         };
@@ -138,7 +139,7 @@ module.exports = function(hydraterFunction, childs) {
             var changes = {};
             changes.hydration_errored = true;
             changes.hydration_error = "Task took too long.";
-            log.warn(task, 'Killing task');
+            log.warn(loggingTask, 'Killing task');
             child.process.kill('SIGTERM');
             setTimeout(function() {
               if(child.process.connected) {
@@ -177,11 +178,11 @@ module.exports = function(hydraterFunction, childs) {
       function patchDocument(changes, cb) {
         // Returning null means we won't complete the hydration, and are waiting for something else.
         if(changes === null) {
-          log.info(task, "Skipped task");
+          log.info(loggingTask, "Skipped task");
           return cb();
         }
 
-        log.info(task, "End of task");
+        log.info(loggingTask, "End of task");
 
         var apiUrl = url.parse(task.callback, false, true);
 
@@ -201,7 +202,8 @@ module.exports = function(hydraterFunction, childs) {
           }
 
           if(res && res.statusCode && res.statusCode !== 204) {
-            log.warn({code: res.statusCode}, "Server refused data!");
+            loggingTask.code = res.statusCode;
+            log.warn(loggingTask, "Server refused data!");
           }
 
           cb(null);