elasticio-sailor-nodejs 3.0.0-dev5 → 3.0.0-dev7

package/run.js

@@ -24,7 +24,6 @@ function prepareSandbox() {
 }
 
 async function putOutToSea(settings, ipc) {
-    logger.trace({ settings }, 'putOutToSea called');
     ipc.send('init:started');
     const deferred = Q.defer();
     sailorInit = deferred.promise;
@@ -32,7 +31,6 @@ async function putOutToSea(settings, ipc) {
 
     //eslint-disable-next-line no-extra-boolean-cast
     if (!!settings.HOOK_SHUTDOWN) {
-        logger.trace('Running hook shutdown');
         disconnectRequired = false;
         //eslint-disable-next-line no-empty-function
         sailor.reportError = () => {
@@ -57,6 +55,23 @@ async function putOutToSea(settings, ipc) {
     ipc.send('init:ended');
 }
 
+async function disconnectAndExit() {
+    if (!disconnectRequired) {
+        return;
+    }
+    disconnectRequired = false;
+
+    try {
+        logger.info('Disconnecting...');
+        await sailor.disconnect();
+        logger.info('Successfully disconnected');
+        process.exit();
+    } catch (err) {
+        logger.error(err, 'Unable to disconnect');
+        process.exit(-1);
+    }
+}
+
 async function gracefulShutdown() {
     if (!disconnectRequired) {
         return;
@@ -73,15 +88,8 @@ async function gracefulShutdown() {
     await sailorInit;
     logger.trace('Waited an init before graceful shutdown');
 
-    try {
-        logger.info('Disconnecting...');
-        await sailor.scheduleShutdown();
-        logger.info('Successfully disconnected');
-        process.exit();
-    } catch (err) {
-        logger.error(err, 'Unable to disconnect');
-        process.exit(-1);
-    }
+    await sailor.scheduleShutdown();
+    await disconnectAndExit();
 }
 
 async function run(settings, ipc) {
@@ -90,7 +98,7 @@ async function run(settings, ipc) {
         await putOutToSea(settings, ipc);
         logger.info('Fully initialized and waiting for messages');
     } catch (e) {
-        if (sailor && !sailor.isConnected()) {
+        if (sailor && !sailor.amqpConnection.closed) {
             await sailor.reportError(e);
         }
         logger.criticalErrorAndExit('putOutToSea.catch', e);

package/config/local.json

@@ -1,19 +0,0 @@
-{
-    "LOG_LEVEL": "trace",
-    "ELASTICIO_FLOW_ID": "692ee23d4ab5d34bb7321559",
-    "ELASTICIO_EXEC_ID": "exec_67890",
-    "ELASTICIO_STEP_ID": "step_1",
-    "ELASTICIO_CONTAINER_ID": "container_abcde",
-    "ELASTICIO_WORKSPACE_ID": "workspace_xyz",
-    "ELASTICIO_USER_ID": "user_1122",
-    "ELASTICIO_COMP_ID": "component_3344",
-    "ELASTICIO_FUNCTION": "data_trigger",
-    "ELASTICIO_API_URI": "http://localhost:9000",
-    "ELASTICIO_API_USERNAME": "task-692ee23d4ab5d34bb7321559",
-    "ELASTICIO_API_KEY": "976ffec8-455b-494e-9478-2d66761f4040",
-    "ELASTICIO_MESSAGE_CRYPTO_IV": "0.03091345790184",
-    "ELASTICIO_MESSAGE_CRYPTO_PASSWORD": "password",
-    "ELASTICIO_SAILOR_PROXY_URI": "http://localhost:5001",
-    "ELASTICIO_COMPONENT_PATH": "./spec/component",
-    "ELASTICIO_EMIT_LIGHTWEIGHT_MESSAGE": "true"
-}