fix: revert to default behavior for SIGTERM and SIGINT signals

Author: vasil-cf

lib/addNewMask.js

@@ -3,7 +3,7 @@ require('@codefresh-io/cf-telemetry/init');
 // ↓ Keep one blank line below to prevent automatic import reordering
 
 const { Logger } = require('@codefresh-io/cf-telemetry/logs');
-const { getServerAddress } = require('./helpers');
+const { getServerAddress, registerExitHandlers } = require('./helpers');
 
 const logger = new Logger('codefresh:containerLogger:addNewMask');
 
@@ -55,6 +55,8 @@ async function updateMasks(secret) {
 }
 
 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');

lib/helpers.js

@@ -55,6 +55,20 @@ const getServerAddress = async () => {
     }
 };
 
+/**
+ * As `@codefresh-io/cf-telemetry/init` changes the original node.js behavior of how SIGTERM and SIGINT
+ * signals are handled, we revert this change back to the original node.js behavior.
+ */
+const registerExitHandlers = () => {
+    process.on('SIGTERM', () => {
+        process.exit(143); // default exit code for SIGTERM
+    });
+
+    process.on('SIGINT', () => {
+        process.exit(130); // default exit code for SIGINT
+    });
+};
+
 module.exports = {
     /**
      * Polyfill of `Promise.withResolvers`, TC39 Stage 4 proposal.
@@ -64,4 +78,5 @@ module.exports = {
     watchForBuildFinishedSignal,
     saveServerAddress,
     getServerAddress,
+    registerExitHandlers,
 };

lib/index.js

@@ -4,6 +4,9 @@ require('@codefresh-io/cf-telemetry/init');
 
 const otel = require('@codefresh-io/cf-telemetry/otel');
 const { Logger: Logs } = require('@codefresh-io/cf-telemetry/logs');
+const { watchForBuildFinishedSignal, registerExitHandlers } = require('./helpers');
+
+registerExitHandlers();
 
 const logs = new Logs('codefresh:containerLogger:index');
 
@@ -17,7 +20,6 @@ const unhandledErrorsTotal = otel.cf.getMeter().createCounter(
 );
 
 const Logger = require('./logger');
-const { watchForBuildFinishedSignal } = require('./helpers');
 
 const taskLoggerConfig = JSON.parse(process.env.TASK_LOGGER_CONFIG);
 

lib/isReady.js

@@ -6,6 +6,9 @@ const { readFileSync } = require('fs');
 const _ = require('lodash');
 const { Logger } = require('@codefresh-io/cf-telemetry/logs');
 const { ContainerHandlingStatus } = require('./enums');
+const { registerExitHandlers } = require('./helpers');
+
+registerExitHandlers();
 
 const logger = new Logger('codefresh:containerLogger:isReady');
 

lib/waitUntilFinish.js

@@ -7,6 +7,7 @@ const path = require('path');
 const Q = require('q');
 const { Logger } = require('@codefresh-io/cf-telemetry/logs');
 const { BuildFinishedSignalFilename } = require('./enums');
+const { registerExitHandlers } = require('./helpers');
 
 const logger = new Logger('codefresh:containerLogger:waitUntilFinish');
 
@@ -87,6 +88,7 @@ class Waiter {
 }
 
 if (require.main === module) {
+    registerExitHandlers();
     const filepath = path.resolve(__dirname, 'state.json');
     Waiter.wait(filepath);
 } else {