screwdriver-buildcluster-queue-worker 2.23.0 → 2.23.3

package/Dockerfile

@@ -8,7 +8,7 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Install Screwdriver build cluster queue worker
-RUN npm install screwdriver-buildcluster-queue-worker@$VERSION --no-package-lock
+RUN npm install screwdriver-buildcluster-queue-worker@$VERSION
 WORKDIR /usr/src/app/node_modules/screwdriver-buildcluster-queue-worker
 
 # Run the service

package/index.js

@@ -4,6 +4,9 @@ const conf = require('config');
 const httpdConfig = conf.get('httpd'); // Setup HTTPd
 const server = require('./lib/server');
 const receiver = require('./receiver');
-const connection = receiver.listen();
 
-server(httpdConfig, connection);
+(async () => {
+    const connection = await receiver.listen();
+
+    server(httpdConfig, connection);
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-buildcluster-queue-worker",
-  "version": "2.23.0",
+  "version": "2.23.3",
   "description": "An amqp connection manager implementation that consumes jobs from Rabbitmq queue.",
   "main": "index.js",
   "scripts": {

package/receiver.js

@@ -115,6 +115,13 @@ const onMessage = data => {
                     thread.kill();
                 })
                 .on('error', async error => {
+                    thread.kill();
+                    if (['403', '404'].includes(error.message.substring(0, 3))) {
+                        channelWrapper.ack(data);
+
+                        return;
+                    }
+
                     if (retryCount >= messageReprocessLimit) {
                         logger.info(`acknowledge, max retries exceeded for ${job}`);
                         try {
@@ -131,7 +138,6 @@ const onMessage = data => {
                         );
                         channelWrapper.nack(data, false, false);
                     }
-                    thread.kill();
                 })
                 .on('exit', () => {
                     logger.info(`thread terminated for ${job} `);