11

Author: skadefro

OpenFlow/src/amqpwrapper.ts

@@ -209,7 +209,6 @@ export class amqpwrapper {
     async AddQueueConsumer(cli: WebSocketClient, queue: string, QueueOptions: any, jwt: string, callback: QueueOnMessage): Promise<string> {
         if (this.channel == null || this.conn == null) throw new Error("Cannot Add new Queue Consumer, not connected to rabbitmq");
         var q: amqpqueue = null;
-        q.cli = cli;
         if (Config.amqp_force_queue_prefix && !Util.IsNullEmpty(jwt)) {
             var tuser = Crypt.verityToken(jwt);
             var name = tuser.username.split("@").join("").split(".").join("");
@@ -220,9 +219,15 @@ export class amqpwrapper {
 
         if (this.exchanges[queue] != null) {
             q = this.queues[queue];
+            try {
+                if (this.channel != null && !Util.IsNullEmpty(q.consumerTag)) await this.channel.cancel(q.consumerTag);
+            } catch (error) {
+                console.error(error);
+            }
         } else {
             q = new amqpqueue();
         }
+        q.cli = cli;
         if (!Util.IsNullEmpty(q.queue)) {
             if (q.queue.startsWith("amq.")) {
                 delete this.queues[q.queue];
@@ -247,7 +252,6 @@ export class amqpwrapper {
     async AddExchangeConsumer(cli: WebSocketClient, exchange: string, algorithm: string, routingkey: string, ExchangeOptions: any, jwt: string, callback: QueueOnMessage): Promise<void> {
         if (this.channel == null || this.conn == null) throw new Error("Cannot Add new Exchange Consumer, not connected to rabbitmq");
         var q: amqpexchange = null;
-        q.cli = cli;
         if (Config.amqp_force_exchange_prefix && !Util.IsNullEmpty(jwt)) {
             var tuser = Crypt.verityToken(jwt);
             var name = tuser.username.split("@").join("").split(".").join("");
@@ -260,6 +264,7 @@ export class amqpwrapper {
         } else {
             q = new amqpexchange();
         }
+        q.cli = cli;
         if (!Util.IsNullEmpty(q.queue)) {
             delete this.queues[q.queue];
         }

VERSION

@@ -1 +1 @@
-1.0.12
+1.0.13

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.0.12"
+    image: "cloudhack/openflow:1.0.13"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.0.12"
+    image: "cloudhack/openflownodered:1.0.13"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.0.12"
+    image: "cloudhack/openflow:1.0.13"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.0.12"
+    image: "cloudhack/openflownodered:1.0.13"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.0.12"
+    image: "cloudhack/openflow:1.0.13"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.0.12"
+    image: "cloudhack/openflownodered:1.0.13"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1