From f8380ff9392fd75304179dc11257dc0b8fd80f1f Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Fri, 13 Apr 2012 11:23:30 -0500 Subject: [PATCH] Add code/reason to close event messages. Remove useless object print in error event. --- include/rfb.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/rfb.js b/include/rfb.js index 75b9797c..62fd3a99 100644 --- a/include/rfb.js +++ b/include/rfb.js @@ -234,21 +234,26 @@ function constructor() { } }); ws.on('close', function(e) { + var msg = ""; if (e.code) { - Util.Info("Close code: " + e.code + ", reason: " + e.reason + ", wasClean: " + e.wasClean); + msg = " (code: " + e.code; + if (e.reason) { + msg += ", reason: " + e.reason; + } + msg += ")"; } if (rfb_state === 'disconnect') { - updateState('disconnected', 'VNC disconnected'); + updateState('disconnected', 'VNC disconnected' + msg); } else if (rfb_state === 'ProtocolVersion') { - fail('Failed to connect to server'); + fail('Failed to connect to server' + msg); } else if (rfb_state in {'failed':1, 'disconnected':1}) { - Util.Error("Received onclose while disconnected"); + Util.Error("Received onclose while disconnected" + msg); } else { - fail('Server disconnected'); + fail('Server disconnected' + msg); } }); ws.on('error', function(e) { - fail("WebSock error: " + e); + fail("WebSock reported an error"); });