add retry logic to checkQueue

Author: skadefro

OpenFlow/src/amqpwrapper.ts

@@ -1,3 +1,4 @@
+import * as retry from "async-retry";
 import * as winston from "winston";
 import * as amqplib from "amqplib";
 import { Util } from "./Util";
@@ -437,13 +438,37 @@ export class amqpwrapper {
         return q;
     }
     async checkQueue(queuename: string): Promise<boolean> {
-        try {
+        var result: boolean = false;
+        result = await retry(async bail => {
             var queue = await this.getqueue(Config.amqp_url, '/', queuename);
-            if (queue.consumers == 0) return false;
-            return true;
-        } catch (error) {
-            return false;
+            let hasConsumers: boolean = false;
+            if (queue.consumers > 0) {
+                hasConsumers = true;
+            }
+            if (!hasConsumers) {
+                if (queue.consumer_details != null && queue.consumer_details.length > 0) {
+                    // console.log(queue.consumer_details[0]);
+                    hasConsumers = true;
+                }
+            }
+            if (hasConsumers == false) {
+                throw new Error("No consumer listening at " + queuename);
+                // return bail();
+            }
+            return hasConsumers;
+        }, {
+            retries: 5,
+            minTimeout: 500,
+            maxTimeout: 500,
+            onRetry: function (error: Error, count: number): void {
+                result = false;
+                console.log("retry " + count + " error " + error.message + " getting " + url);
+            }
+        });
+        if (result == true) {
+            return result;
         }
+        return false;
     }
     async getvhosts(amqp_url) {
         var q = this.parseurl(amqp_url);

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.0.41
+1.0.42

gulpfile.js

@@ -93,13 +93,27 @@ gulp.task("bumpconfigmap", function () {
 gulp.task("bumpaiotfrontend", function () {
     var version = "0.0.1";
     version = fs.readFileSync("../aiot-frontend/VERSION", "utf8");
-
     console.log('cloudhack/aiot-frontend:' + version);
     return gulp.src(["config/**/controllers.yml"])
         .pipe(replace(/aiot-frontend:\d+(\.\d+)+/g, 'aiot-frontend:' + version))
         .pipe(gulp.dest("config"));
 });
+gulp.task("bumpprojectfiles", function () {
+    var data = require("./package.json");
+    console.log(data.version + " updated to " + version);
+    data.version = version;
+    var json = JSON.stringify(data, null, 2);
+    fs.writeFileSync("package.json", json);
+
+    data = require("./OpenFlowNodeRED/package.json");
+    console.log(data.version + " updated to " + version);
+    data.version = version;
+    json = JSON.stringify(data, null, 2);
+    fs.writeFileSync("OpenFlowNodeRED/package.json", json);
+    return gulp.src('.');
+
+});
 
-gulp.task("bump", gulp.series("bumpflow", "bumpnodered", "bumpconfigmap", "bumpaiotfrontend"));
+gulp.task("bump", gulp.series("bumpflow", "bumpnodered", "bumpconfigmap", "bumpaiotfrontend", "bumpprojectfiles"));
 
 gulp.task("default", gulp.series("copyfiles1", "watch"));

openflow-1.0.4.tgz

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {