update during creation to restore task logger, and to never restore a step

Author: itai-codefresh

lib/logger.js

@@ -28,7 +28,6 @@ class Logger {
         this.containerLoggers       = [];
         this.logSize                = 0;
         this.taskLogger             = undefined;
-        this.steps                  = {};
 
         let dockerSockPath;
         if (fs.existsSync('/var/run/codefresh/docker.sock')) {
@@ -76,6 +75,9 @@ class Logger {
                 this.taskLogger = taskLogger;
                 logger.info(`taskLogger successfully created`);
 
+                return taskLogger.restore();
+            })
+            .then(() => {
                 this._listenForNewContainers();
 
                 this.state.status = 'ready';
@@ -146,7 +148,6 @@ class Logger {
         const containerId                   = container.Id || container.id;
         const containerStatus               = container.Status || container.status;
         const receivedLoggerId              = _.get(container, 'Labels', _.get(container, 'Actor.Attributes'))['io.codefresh.logger.id'];
-        const runCreationLogic              = _.get(container, 'Labels', _.get(container, 'Actor.Attributes'))['io.codefresh.runCreationLogic'];
         const stepName                      = _.get(container, 'Labels', _.get(container, 'Actor.Attributes'))['io.codefresh.logger.stepName'];
         const receivedLogSizeLimit = _.get(container,
             'Labels',
@@ -198,25 +199,9 @@ class Logger {
 
         this.state[containerId] = { status: ContainerHandlingStatus.INITIALIZING };
         logger.info(`Handling container: ${containerId}, status: '${containerStatus}'`);
-        let stepLogger = this.steps[stepName];
-        if (!stepLogger) {
-            stepLogger = this.taskLogger.create(stepName, undefined, undefined, runCreationLogic);
-            this.steps[stepName] = stepLogger;
-            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,
-                    message: `Failed to restore step`
-                });
-                logger.error(error.toString());
-                return;
-            }
-        } else {
-            logger.info(`Reusing step logger for container: ${containerId}`);
-        }
+        const stepLogger = this.taskLogger.create(stepName, undefined, undefined, true);
+        logger.info(`Brought step logger for container: ${containerId}`);
+
 
         const logSizeLimit = receivedLogSizeLimit ? (parseInt(receivedLogSizeLimit) * 1000000) : undefined;
 

package.json

@@ -6,7 +6,7 @@
     "cf-container-logger"
   ],
   "dependencies": {
-    "@codefresh-io/task-logger": "^0.0.8",
+    "@codefresh-io/task-logger": "^0.0.9",
     "cf-errors": "^0.1.11",
     "cf-logs": "^1.1.0",
     "docker-events": "0.0.2",

test/logger.unit.spec.js

@@ -73,7 +73,8 @@ describe('Logger tests', () => {
 
             it('should start and not listen for existing container in case findExistingContainers param is false', async () => { // jshint ignore:line
                 const taskLogger        = { // jshint ignore:line
-                    on: sinon.spy()
+                    on: sinon.spy(),
+                    restore: sinon.spy(() => Q.resolve())
                 };
                 const TaskLoggerFactory = sinon.spy(() => {
                     return Q.resolve(taskLogger);
@@ -108,7 +109,8 @@ describe('Logger tests', () => {
             it('should start and listen for existing container in case findExistingContainers param is "true"', async () => {
 
                 const taskLogger        = {
-                    on: sinon.spy()
+                    on: sinon.spy(),
+                    restore: sinon.spy(() => Q.resolve())
                 };
                 const TaskLoggerFactory = sinon.spy(() => {
                     return Q.resolve(taskLogger);
@@ -617,67 +619,6 @@ describe('Logger tests', () => {
 
                 describe('should print an error in case firebase ref fails', () => {
 
-                    it('error while create firebase logger ref', async () => {
-                        const startSpy = sinon.spy(() => {
-                            return Q.resolve();
-                        });
-                        const infoSpy  = sinon.spy();
-                        const errorSpy = sinon.spy();
-                        const Logger   = proxyquire('../lib/logger', {
-                            'cf-logs': {
-                                Logger: () => {
-                                    return {
-                                        info: infoSpy,
-                                        error: errorSpy
-                                    };
-
-                                }
-                            },
-                            './ContainerLogger': function () {
-                                const emitter = new EventEmitter();
-                                emitter.start = startSpy;
-                                return emitter;
-                            }
-                        });
-
-                        const loggerId               = 'loggerId';
-                        const firebaseAuthUrl        = 'firebaseAuthUrl';
-                        const firebaseSecret         = 'firebaseSecret';
-                        const firebaseMetricsLogsUrl = 'firebaseMetricsLogsUrl';
-                        const findExistingContainers = false;
-                        const logger                 = new Logger({
-                            loggerId, firebaseAuthUrl, firebaseSecret, findExistingContainers, firebaseMetricsLogsUrl
-                        });
-                        logger._writeNewState        = sinon.spy();
-                        logger.taskLogger = {
-                            on: sinon.spy(),
-                            create: function () {
-                                return {
-                                    restore: sinon.spy(() => Q.reject(new Error('my error')))
-                                }
-                            },
-                            setLogSize: sinon.spy()
-                        };
-                        const container              = {
-                            Id: 'containerId',
-                            Status: ContainerStatus.CREATE,
-                            Labels: {
-                                'io.codefresh.logger.id': 'loggerId',
-                                'io.codefresh.logger.stepName': 'name',
-                                'io.codefresh.logger.strategy': LoggerStrategy.ATTACH,
-                            }
-                        };
-                        logger._handleContainer(container);
-                        await Q.delay(10);
-                        expect(errorSpy).to.have.been.calledOnce; // jshint ignore:line
-                        expect(errorSpy)
-                            .to
-                            .have
-                            .been
-                            .calledWith('Error: Failed to restore step; caused by Error: my error'); // jshint ignore:line
-
-                    });
-
                     it('error while starting the container logger instance', (done) => {
                         const startSpy = sinon.spy(() => {
                             return Q.reject(new Error('ContainerLogger error'));

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@codefresh-io/task-logger@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-0.0.8.tgz#5fae5ac1c63ee9b6e764d1ef88bd7436c5cf2fe9"
-  integrity sha512-tbk4y5YTKyjHRvpEOzAxHHD8yMAQtV2BhStcNjBPoU2qpbzRG9D2NbbkAT1iHpqge6BPOI0GWfwty5yd9DXECQ==
+"@codefresh-io/task-logger@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-0.0.9.tgz#35b4ad6eba02d5d4e50fc5c3770a305da639b523"
+  integrity sha512-aFjBQPUej1sZ/NnAH8y6wIOVbE9I0PzU9U6j+wD0GYglWTEF8hHdfZAFyAEON3G1osQNk3TSKpn3JIdf3ZQZ1A==
   dependencies:
     cf-errors "^0.1.11"
     crypto "0.0.3"