Skip to content

Commit 24d9423

Browse files
committed
If object is passed as disconnect reason, JSON.stringify it before logging
1 parent c1625db commit 24d9423

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

scserver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,11 +864,11 @@ SCServer.prototype._passThroughAuthenticateMiddleware = function (options, cb) {
864864
if (callbackInvoked) {
865865
self.emit('warning', new InvalidActionError('Callback for ' + self.MIDDLEWARE_AUTHENTICATE + ' middleware was already invoked'));
866866
} else {
867+
callbackInvoked = true;
867868
var isBadToken = false;
868869
if (results.length) {
869870
isBadToken = results[results.length - 1] || false;
870871
}
871-
callbackInvoked = true;
872872
if (err) {
873873
if (err === true) {
874874
err = new SilentMiddlewareBlockedError('Action was silently blocked by ' + self.MIDDLEWARE_AUTHENTICATE + ' middleware', self.MIDDLEWARE_AUTHENTICATE);

scsocket.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,17 @@ SCSocket.prototype._onSCClose = function (code, data) {
222222
if (!SCSocket.ignoreStatuses[code]) {
223223
var failureMessage;
224224
if (data) {
225-
failureMessage = 'Socket connection failed: ' + data;
225+
var reasonString;
226+
if (typeof data == 'object') {
227+
try {
228+
reasonString = JSON.stringify(data);
229+
} catch(error) {
230+
reasonString = data.toString();
231+
}
232+
} else {
233+
reasonString = data;
234+
}
235+
failureMessage = 'Socket connection failed: ' + reasonString;
226236
} else {
227237
failureMessage = 'Socket connection failed for unknown reasons';
228238
}

0 commit comments

Comments
 (0)