websocketMessage JSON parsing error catching

diff --git a/server/app.js b/server/app.js
index 26839f7a73fd39c8eb3e691eb2f85b7e1823bfa2..7f544a503f62aaf2e68c25dffa3eeeda38adadc7 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -996,11 +996,16 @@ this.IRCConnection = function (websocket, nick, host, port, ssl, password, callb
 
 this.websocketMessage = function (websocket, msg, callback) {
     var args, obj, channels, keys;
-    try {
+    //try {
         if ((callback) && (typeof (callback) !== 'function')) {
             callback = null;
         }
-        msg.data = JSON.parse(msg.data);
+        try {
+            msg.data = JSON.parse(msg.data);
+        } catch (e) {
+            kiwi.log('[app.websocketMessage] JSON parsing error ' + msg.data);
+            return;
+        }
         args = msg.data.args;
         switch (msg.data.method) {
         case 'privmsg':
@@ -1091,9 +1096,9 @@ this.websocketMessage = function (websocket, msg, callback) {
             break;
         default:
         }
-    } catch (e) {
-        kiwi.log("Caught error: " + e);
-    }
+    //} catch (e) {
+    //    kiwi.log("Caught error (app.websocketMessage): " + e);
+    //}
 };