add restart counter and fix waiter (#39)

* add restart counter and fix waiter

Author: oren-codefresh

lib/index.js

@@ -27,20 +27,24 @@ logger.validate();
 logger.start();
 
 process.on('beforeExit', (code) => {
+    console.log(`beforeExit: ${code}`);
     logger.state.beforeExitCode = code;
     logger._writeNewState();
 });
 process.on('exit', (code) => {
+    console.log(`exit: ${code}`);
     logger.state.exitCode = code;
     logger._writeNewState();
 });
 
 process.on('uncaughtException', (error) => {
+    console.log(`uncaughtException: ${error}`);
     logger.state.uncaughtException = error;
     logger._writeNewState();
 });
 
 process.on('unhandledRejection', (reason) => {
+    console.log(`unhandledRejection: ${reason}`);
     logger.state.unhandledRejection = reason;
     logger._writeNewState();
 });

lib/logger.js

@@ -12,6 +12,8 @@ const ContainerHandlingStatus = require('./enums').ContainerHandlingStatus;
 const ContainerLogger         = require('./ContainerLogger');
 const { TaskLogger }          = require('@codefresh-io/task-logger');
 
+
+const initialState = { status: 'init', lastLogsDate: Date.now() , failedHealthChecks: [] , restartCounter: 0, containers: {} };
 class Logger {
 
     constructor({
@@ -20,7 +22,6 @@ class Logger {
         findExistingContainers,
         logSizeLimit
     }) {
-        this.state                  = { status: 'init', lastLogsDate: Date.now() , failedHealthChecks: [] };
         this.taskLoggerConfig       = taskLoggerConfig;
         this.loggerId               = loggerId;
         this.findExistingContainers = findExistingContainers === 'true';
@@ -41,6 +42,7 @@ class Logger {
         this.docker                 = new Docker({
             socketPath: dockerSockPath,
         });
+        this._readState();
     }
 
     /**
@@ -103,6 +105,18 @@ class Logger {
             });
     }
 
+    _readState() {
+        const filePath = `${__dirname}/state.json`;
+        if (fs.existsSync(filePath)) {
+            this.state = _.omit(JSON.parse(fs.readFileSync(filePath, 'utf8'), 'containers'));
+            this.state.containers = {};
+            let restartCounter =  _.get(this.state, 'restartCounter', 0);
+             restartCounter++;
+             this.state.restartCounter = restartCounter;
+        }else {
+            this.state =  initialState;
+        }
+    }
     /**
      * will print the error and exit the process
      * @param err
@@ -205,7 +219,7 @@ class Logger {
         }
 
 
-        this.state[containerId] = { status: ContainerHandlingStatus.INITIALIZING };
+        this.state.containers[containerId] = { status: ContainerHandlingStatus.INITIALIZING };
         logger.info(`Handling container: ${containerId}, status: '${containerStatus}'`);
         const stepLogger = this.taskLogger.create(stepName, undefined, runCreationLogic);
         logger.info(`Brought step logger for container: ${containerId}`);
@@ -228,7 +242,7 @@ class Logger {
 
         containerLogger.start()
             .done(() => {
-                this.state[containerId] = { status: ContainerHandlingStatus.LISTENING };
+                this.state.containers[containerId] = { status: ContainerHandlingStatus.LISTENING };
                 this._writeNewState();
             }, (err) => {
                 const error = new CFError({
@@ -256,7 +270,7 @@ class Logger {
      * @private
      */
     _containerHandled(containerId) {
-        return this.state[containerId];
+        return this.state.containers[containerId];
     }
 
     /**

lib/waitUntilFinish.js

@@ -12,8 +12,9 @@ class Waiter {
         this.finished = false;
     }
 
-    _stateListener(currentFileState) {
-        this.lastLogsDate = currentFileState.mtimeMs;
+    _stateListener() {
+        const state = JSON.parse(fs.readFileSync(this.filepath, 'utf8'));
+        this.lastLogsDate = state.lastLogsDate;
     }
 
 

service.yaml

@@ -1 +1 @@
-version: 1.2.1
+version: 1.2.2

test/logger.unit.spec.js

@@ -389,6 +389,9 @@ describe('Logger tests', () => {
             const Logger = proxyquire('../lib/logger', {
                 'fs': {
                     writeFile: writeFileSpy,
+                    readFileSync: sinon.spy(() => {
+                        return '{}';
+                    }),
                     existsSync: () => { return true; }
                 }
             });
@@ -406,6 +409,9 @@ describe('Logger tests', () => {
             const Logger = proxyquire('../lib/logger', {
                 'fs': {
                     writeFile: writeFileSpy,
+                    readFileSync: sinon.spy(() => {
+                        return '{}';
+                    }),
                     existsSync: () => { return true; },
                 }
             });