add more logs and timestamps for printed logs (#17)

Author: itai-codefresh

lib/index.js

@@ -5,7 +5,12 @@ const cflogs = require('cf-logs');
 
 const loggerOptions = {
     filePath: path.join(__dirname, '../logs', 'logs.log'),
-    console: process.env.LOG_TO_CONSOLE || false
+    console: process.env.LOG_TO_CONSOLE || false,
+    consoleOptions: {
+        timestamp() {
+            return new Date().toISOString();
+        }
+    }
 };
 cflogs.init(loggerOptions);
 

lib/logger.js

@@ -201,8 +201,10 @@ class Logger {
         let stepLogger = this.steps[stepName];
         if (!stepLogger) {
             stepLogger = this.taskLogger.create(stepName, undefined, undefined, runCreationLogic);
+            logger.info(`Created new step logger for container: ${containerId}`);
             try {
                 await stepLogger.restore(); // jshint ignore:line
+                logger.info(`Restored step logger state for container: ${containerId}`);
             } catch (err) {
                 const error = new CFError({
                     cause: err,
@@ -211,6 +213,8 @@ class Logger {
                 logger.error(error.toString());
                 return;
             }
+        } else {
+            logger.info(`Reusing step logger for container: ${containerId}`);
         }
 
         const logSizeLimit = receivedLogSizeLimit ? (parseInt(receivedLogSizeLimit) * 1000000) : undefined;

package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@codefresh-io/task-logger": "^0.0.3",
     "cf-errors": "^0.1.11",
-    "cf-logs": "git+https://github.com/codefresh-io/cf-logs.git#ceba4f309e52a077747a0c6bf9c3ad02e762dc4b",
+    "cf-logs": "^1.1.0",
     "docker-events": "0.0.2",
     "dockerode": "^2.3.0",
     "forever": "^0.15.3",

yarn.lock

@@ -552,11 +552,13 @@ cf-errors@^0.1.11:
   dependencies:
     lodash "4.15.0"
 
-"cf-logs@git+https://github.com/codefresh-io/cf-logs.git#ceba4f309e52a077747a0c6bf9c3ad02e762dc4b":
-  version "0.0.3"
-  resolved "git+https://github.com/codefresh-io/cf-logs.git#ceba4f309e52a077747a0c6bf9c3ad02e762dc4b"
+cf-logs@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cf-logs/-/cf-logs-1.1.0.tgz#2ea2dae43c71a2a06579b82a287a4d91a86db3f5"
+  integrity sha512-dUcIw2K6PjHouhaiTbJTSN2iPoja+diS0vTcv3+ENcq9o1Ow2AziYAWqYW0MtUJxrdKDiowyZxIQvJ54cCBPTA==
   dependencies:
     lodash "^3.10.1"
+    q "^1.5.1"
     winston "2.1.1"
     winston-loggly "1.2.0"
 
@@ -3593,6 +3595,11 @@ q@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
+q@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
 qs@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.1.tgz#801fee030e0b9450d6385adc48a4cc55b44aedfc"