Update task logger version and don't create step if already created previously (#16)

Author: itai-codefresh

lib/logger.js

@@ -28,6 +28,7 @@ class Logger {
         this.containerLoggers       = [];
         this.logSize                = 0;
         this.taskLogger             = undefined;
+        this.steps                  = {};
 
         let dockerSockPath;
         if (fs.existsSync('/var/run/codefresh/docker.sock')) {
@@ -197,7 +198,20 @@ class Logger {
 
         this.state[containerId] = { status: ContainerHandlingStatus.INITIALIZING };
         logger.info(`Handling container: ${containerId}, status: '${containerStatus}'`);
-        const stepLogger = this.taskLogger.create(stepName, undefined, undefined, runCreationLogic);
+        let stepLogger = this.steps[stepName];
+        if (!stepLogger) {
+            stepLogger = this.taskLogger.create(stepName, undefined, undefined, runCreationLogic);
+            try {
+                await stepLogger.restore(); // jshint ignore:line
+            } catch (err) {
+                const error = new CFError({
+                    cause: err,
+                    message: `Failed to restore step`
+                });
+                logger.error(error.toString());
+                return;
+            }
+        }
 
         const logSizeLimit = receivedLogSizeLimit ? (parseInt(receivedLogSizeLimit) * 1000000) : undefined;
 

package.json

@@ -6,7 +6,7 @@
     "cf-container-logger"
   ],
   "dependencies": {
-    "@codefresh-io/task-logger": "^0.0.2",
+    "@codefresh-io/task-logger": "^0.0.3",
     "cf-errors": "^0.1.11",
     "cf-logs": "git+https://github.com/codefresh-io/cf-logs.git#ceba4f309e52a077747a0c6bf9c3ad02e762dc4b",
     "docker-events": "0.0.2",

test/logger.unit.spec.js

@@ -617,7 +617,7 @@ describe('Logger tests', () => {
 
                 describe('should print an error in case firebase ref fails', () => {
 
-                    it.skip('error while create firebase logger ref', async () => {
+                    it('error while create firebase logger ref', async () => {
                         const startSpy = sinon.spy(() => {
                             return Q.resolve();
                         });

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@codefresh-io/task-logger@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-0.0.2.tgz#464bf69309447877e45f6770d68cd89f48a78c4c"
-  integrity sha512-EpBqPMxzLC/EHzBRDiA8TZx34rgUR+qHBiZB/EBk0Hz+mVROxK+GoGaCJrhIYsVZ7FOp2UbWtI9WUpNRe+0ciA==
+"@codefresh-io/task-logger@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-0.0.3.tgz#08fc406ca53555b2a713c8b1b5650b574146bcbc"
+  integrity sha512-AzpRHw87LZ1E8Ez7HQpn5N2cGsnMvU0e32zLh+02DP7GP4MtDMdUFsglHbzkwLlKWNmIj/lLaJeddR9sIXcbUA==
   dependencies:
     cf-errors "^0.1.11"
     crypto "0.0.3"
@@ -17,6 +17,7 @@
     q "^1.4.1"
     redis "^2.8.0"
     request "^2.88.0"
+    retry "^0.12.0"
 
 "@sinonjs/commons@^1.0.2", "@sinonjs/commons@^1.3.0":
   version "1.3.0"
@@ -3897,6 +3898,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
 revalidator@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b"