228

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -560,7 +560,7 @@ export class Message {
                                 containers: [
                                     {
                                         name: 'nodered',
-                                        image: 'cloudhack/openflownodered:0.0.227',
+                                        image: 'cloudhack/openflownodered:0.0.228',
                                         imagePullPolicy: "Always",
                                         env: [
                                             { name: "saml_federation_metadata", value: Config.saml_federation_metadata },

OpenFlowNodeRED/src/nodered/nodes/amqp_nodes.ts

@@ -60,6 +60,11 @@ export class amqp_consumer_node {
             if (!NoderedUtil.IsNullEmpty(username) && !NoderedUtil.IsNullEmpty(password)) {
                 this.host = "amqp://" + username + ":" + password + "@" + this.host;
             } else {
+                if (!NoderedUtil.IsNullUndefinded(Config.queue_prefix)) {
+                    if (NoderedUtil.IsNullUndefinded(_config) || NoderedUtil.IsNullEmpty(_config.username)) {
+                        this.config.queue = Config.queue_prefix + this.config.queue;
+                    }
+                }
                 // this.host = "amqp://" + this.host;
                 this.host = Config.amqp_url;
             }
@@ -83,8 +88,12 @@ export class amqp_consumer_node {
         try {
             var result: any = {};
             result.amqpacknowledgment = ack;
+            var data: any = null;
+            try {
+                data = JSON.parse(msg.content.toString());
+            } catch (error) {
 
-            var data = JSON.parse(msg.content.toString());
+            }
             try {
                 data.payload = JSON.parse(data.payload);
             } catch (error) {
@@ -145,6 +154,13 @@ export class amqp_publisher_node {
                 // this.host = "amqp://" + this.host;
                 this.host = Config.amqp_url;
             }
+            if (!NoderedUtil.IsNullUndefinded(Config.queue_prefix)) {
+                if (NoderedUtil.IsNullUndefinded(_config) || NoderedUtil.IsNullEmpty(_config.username)) {
+                    this.config.queue = Config.queue_prefix + this.config.queue;
+                    this.config.localqueue = Config.queue_prefix + this.config.localqueue;
+                }
+            }
+
             this.connect();
         } catch (error) {
             NoderedUtil.HandleError(this, error);

VERSION

@@ -1 +1 @@
-0.0.227
+0.0.228