jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add code/reason to close event messages. Remove useless object print in error event.

This commit is contained in:
Joel Martin 2012-04-13 11:23:30 -05:00
parent f736c3316a
commit f8380ff939
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/rfb.js
View File

@ -234,21 +234,26 @@ function constructor() {
} }
}); });
ws.on('close', function(e) { ws.on('close', function(e) {
var msg = "";
if (e.code) { 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') { if (rfb_state === 'disconnect') {
updateState('disconnected', 'VNC disconnected'); updateState('disconnected', 'VNC disconnected' + msg);
} else if (rfb_state === 'ProtocolVersion') { } 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}) { } else if (rfb_state in {'failed':1, 'disconnected':1}) {
Util.Error("Received onclose while disconnected"); Util.Error("Received onclose while disconnected" + msg);
} else { } else {
fail('Server disconnected'); fail('Server disconnected' + msg);
} }
}); });
ws.on('error', function(e) { ws.on('error', function(e) {
fail("WebSock error: " + e); fail("WebSock reported an error");
}); });