elasticio-sailor-nodejs 2.6.29 → 2.7.0-beta.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.7.0 (September 15, 2022)
+
+* Add AMQP_PERSISTENT_MESSAGES configuration env var to enable persistent delivery mode.
+
 ## 2.6.29 (July 14, 2022)
 
 * Enabled keep-alive for global HTTPS agent ([#6359](https://github.com/elasticio/elasticio/issues/6359))

package/lib/amqp.js

@@ -205,21 +205,23 @@ class Amqp {
         await this._ensureConsumerChannel();
 
         const { consumerTag } = await this.consumerChannel.consume(queue, async (amqpMessage) => {
+            if (!amqpMessage) {
+                log.warn('Consumer cancelled by rabbitmq');
+                return;
+            }
             let message;
             try {
                 message = this._decodeMessage(amqpMessage);
-            } catch (e) {
-                log.error(e,
-                    'Error occurred while parsing message #%j payload',
-                    amqpMessage.fields.deliveryTag
-                );
+            } catch (err) {
+                log.error({ err, deliveryTag: amqpMessage.fields.deliveryTag },
+                    'Error occurred while parsing message payload');
                 this.reject(amqpMessage);
                 return;
             }
             try {
                 await messageHandler(message, amqpMessage);
-            } catch (e) {
-                log.error(e, 'Failed to process message #%j, reject', amqpMessage.fields.deliveryTag);
+            } catch (err) {
+                log.error({ err, deliveryTag: amqpMessage.fields.deliveryTag }, 'Failed to process message, reject');
                 this.reject(amqpMessage);
             }
         });
@@ -328,6 +330,9 @@ class Amqp {
         if (iteration) {
             options.headers.retry = iteration;
         }
+        if (this.settings.AMQP_PERSISTENT_MESSAGES) {
+            options.persistent = true;
+        }
 
         log.debug('Current memory usage: %s Mb', process.memoryUsage().heapUsed / 1048576);
         log.trace('Pushing to exchange=%s, routingKey=%s, messageSize=%d, options=%j, iteration=%d',

package/lib/settings.js

@@ -20,6 +20,7 @@ function getOptionalEnvVars(envVars) {
         AMQP_PUBLISH_RETRY_DELAY: 100, // 100ms
         AMQP_PUBLISH_RETRY_ATTEMPTS: Infinity,
         AMQP_PUBLISH_MAX_RETRY_DELAY: 5 * 60 * 1000, // 5 mins
+        AMQP_PERSISTENT_MESSAGES: false,
         OUTGOING_MESSAGE_SIZE_LIMIT: 10485760,
         NO_SELF_PASSTRHOUGH: false,
         PROTOCOL_VERSION: 1,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elasticio-sailor-nodejs",
   "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-  "version": "2.6.29",
+  "version": "2.7.0-beta.0",
   "main": "run.js",
   "scripts": {
     "audit": "better-npm-audit audit --level high --production",

package/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "editor.rulers": [
-    {
-        "column": 120
-    }
-    ]
-}