Added try catch to Queen rabbit stuff so if an bad message comes through

it won't explode
bradleyjones · Nov 14, 2013 · 902f543 · 902f543
1 parent 57ce97b
commit 902f543
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/Queen/rabbit/rabbit_pubsub.js b/Queen/rabbit/rabbit_pubsub.js
@@ -39,10 +39,15 @@ function onQueueCreateOk(exchange, routingKey, callback) {
 
 function onMessage(callback) {
     return function(message, headers, deliveryInfo) {
-        console.log("Message Received! Parsing...");
-        var msg = message['data'].toString('utf-8');
-        console.log(msg);
-        console.log(JSON.parse(msg));
-        callback(JSON.parse(msg));
+        try {
+            console.log("Message Received! Parsing...");
+            var msg = message['data'].toString('utf-8');
+            console.log(msg);
+            console.log(JSON.parse(msg));
+            callback(JSON.parse(msg));
+        } catch(err) {
+            console.log("There was an error: " + err);
+            return
+        }
     }
 }
diff --git a/Queen/rabbit/rabbit_rpc.js b/Queen/rabbit/rabbit_rpc.js
@@ -23,15 +23,20 @@ exports.RPCQuery = function (queueName, data, callback) {
         connection.queue('', {exclusive: true}, function (queue) {
             self.responseQueue = queue.name;
             queue.subscribe(function (message, headers, deliveryInfo, m) {
-                if (self.correlationId === m.correlationId) {
-                    clearTimeout(timeout);
-                    connection.end();
-                    var msg = message['data'].toString('utf-8');
-                    console.log('Parsing Response...');
-                    console.log(msg);
-                    callback(JSON.parse(msg));
+                try {
+                    console.log(message)
+                    if (self.correlationId === m.correlationId) {
+                        clearTimeout(timeout);
+                        connection.end();
+                        var msg = message['data'].toString('utf-8');
+                        console.log('Parsing Response...');
+                        console.log(msg);
+                        callback(JSON.parse(msg));
+                    }
+                } catch(err) {
+                    console.log("Some Error Occured: " + err);
+                    return  
                 }
-                console.log(message);
             });
 
             connection.publish(queueName, data, {