fix: add terminate() before process.exit

Author: vasil-cf

lib/addNewMask.js

@@ -1,5 +1,5 @@
 // ↓ Should be imported first
-require('@codefresh-io/cf-telemetry/init');
+const { terminate } = require('@codefresh-io/cf-telemetry/init');
 // ↓ Keep one blank line below to prevent automatic import reordering
 
 const { Logger } = require('@codefresh-io/cf-telemetry/logs');
@@ -43,28 +43,34 @@ async function updateMasks(secret) {
         if (response.statusCode === 201) {
             logger.log(`successfully updated masks with secret: ${secret.key}`);
             exitWithError = false;
+            await terminate();
             process.exit(exitCodes.success);
         } else {
             logger.error(`could not create mask for secret: ${secret.key}. Server responded with: ${response.statusCode}\n\n${response.body}`);
+            await terminate();
             process.exit(exitCodes.error);
         }
     } catch (error) {
         logger.error(`could not create mask for secret: ${secret.key}. Error: ${error}`);
+        await terminate();
         process.exit(exitCodes.error);
     }
 }
 
 if (require.main === module) {
     registerExitHandlers();
 
-    // first argument is the secret key second argument is the secret value
-    if (process.argv.length < 4) {
-        logger.log('not enough arguments, need secret key and secret value');
-        process.exit(exitCodes.missingArguments);
-    }
-    const key = process.argv[2];
-    const value = process.argv[3];
-    updateMasks({ key, value });
+    (async () => {
+        // first argument is the secret key second argument is the secret value
+        if (process.argv.length < 4) {
+            logger.log('not enough arguments, need secret key and secret value');
+            await terminate();
+            process.exit(exitCodes.missingArguments);
+        }
+        const key = process.argv[2];
+        const value = process.argv[3];
+        await updateMasks({ key, value });
+    })();
 } else {
     module.exports = { updateMasks, exitHandler };
 }

lib/index.js

@@ -32,9 +32,6 @@ const logger = new Logger({
     showProgress: process.env.SHOW_PROGRESS === 'true',
 });
 
-logger.validate();
-logger.start();
-
 process.on('beforeExit', (code) => {
     logs.log(`beforeExit: ${code}`);
     logger.state.beforeExitCode = code;
@@ -59,3 +56,8 @@ process.on('unhandledRejection', (reason) => {
     logger.state.unhandledRejection = reason;
     logger._writeNewState();
 });
+
+(async () => {
+    await logger.validate();
+    logger.start();
+})();

lib/isReady.js

@@ -1,5 +1,5 @@
 // ↓ Should be imported first
-require('@codefresh-io/cf-telemetry/init');
+const { terminate } = require('@codefresh-io/cf-telemetry/init');
 // ↓ Keep one blank line below to prevent automatic import reordering
 
 const { readFileSync } = require('fs');
@@ -31,7 +31,7 @@ function isContainerLoggerReady(state) {
     return isReady;
 }
 
-(() => {
+(async () => {
     const containerId = process.argv[2];
     const state = JSON.parse(readFileSync('./lib/state.json').toString('utf-8'));
     let isReady = false;
@@ -41,5 +41,6 @@ function isContainerLoggerReady(state) {
         isReady = isContainerLoggerReady(state);
     }
 
+    await terminate();
     process.exit(isReady ? 0 : 1);
 })();

lib/logger.js

@@ -1,3 +1,7 @@
+// ↓ Should be imported first
+const { terminate } = require('@codefresh-io/cf-telemetry/init');
+// ↓ Keep one blank line below to prevent automatic import reordering
+
 const fs = require('fs');
 const { EventEmitter } = require('events');
 const _ = require('lodash');
@@ -64,12 +68,12 @@ class Logger {
      * validates the passed params of the constructor
      * @returns {*}
      */
-    validate() {
+    async validate() {
         if (!this.taskLoggerConfig) {
-            return this._error(new CFError('taskLogger configuration is missing'));
+            return await this._error(new CFError('taskLogger configuration is missing'));
         }
         if (!this.loggerId) {
-            return this._error(new CFError('logger id is missing'));
+            return await this._error(new CFError('logger id is missing'));
         }
         return undefined;
     }
@@ -120,8 +124,8 @@ class Logger {
                     this._listenForExistingContainers();
                 }
             })
-            .catch((err) => {
-                this._error(new CFError({
+            .catch(async (err) => {
+                await this._error(new CFError({
                     cause: err,
                     message: `Failed to create taskLogger`
                 }));
@@ -149,8 +153,9 @@ class Logger {
      * will print the error and exit the process
      * @param err
      */
-    _error(err) {
+    async _error(err) {
         logger.error(err.toString());
+        await terminate();
         process.exit(1);
     }
 
@@ -344,9 +349,9 @@ class Logger {
      */
     _listenForExistingContainers() {
         logger.info(`Finding existing containers to listen on`);
-        this.docker.listContainers((err, containers) => {
+        this.docker.listContainers(async (err, containers) => {
             if (err) {
-                this._error(new CFError({
+                await this._error(new CFError({
                     cause: err,
                     message: `Query of existing containers failed`
                 }));