Fix error details in log

ably · Apr 3, 2015 · d089038 · d089038
1 parent 385c472
commit d089038
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/browser/lib/transport/iframeagent.js b/browser/lib/transport/iframeagent.js
@@ -166,7 +166,7 @@
 
 		var sendRequest = this.sendRequest = XHRRequest.createRequest(sendUri, null, authParams, encodeRequest(items), REQ_SEND);
 		sendRequest.on('complete', function(err, data) {
-			if(err) Logger.logAction(Logger.LOG_ERROR, 'IframeAgent.sendItems()', 'on complete: err = ' + err);
+			if(err) Logger.logAction(Logger.LOG_ERROR, 'IframeAgent.sendItems()', 'on complete: err = ' + Utils.inspectError(err));
 			self.sendRequest = null;
 			if(data) self.onData(data);
 

diff --git a/common/lib/client/auth.js b/common/lib/client/auth.js
@@ -249,7 +249,7 @@ var Auth = (function() {
 		};
 		tokenRequestCallback(tokenParams, function(err, tokenRequestOrDetails) {
 			if(err) {
-				Logger.logAction(Logger.LOG_ERROR, 'Auth.requestToken()', 'token request signing call returned error; err = ' + err);
+				Logger.logAction(Logger.LOG_ERROR, 'Auth.requestToken()', 'token request signing call returned error; err = ' + Utils.inspectError(err));
 				if(!('code' in err))
 					err.code = 40170;
 				if(!('statusCode' in err))
@@ -264,7 +264,7 @@ var Auth = (function() {
 			}
 			tokenRequest(tokenRequestOrDetails, function(err, tokenResponse, headers, unpacked) {
 				if(err) {
-					Logger.logAction(Logger.LOG_ERROR, 'Auth.requestToken()', 'token request API call returned error; err = ' + err);
+					Logger.logAction(Logger.LOG_ERROR, 'Auth.requestToken()', 'token request API call returned error; err = ' + Utils.inspectError(err));
 					callback(err);
 					return;
 				}

diff --git a/common/lib/client/realtimechannel.js b/common/lib/client/realtimechannel.js
@@ -458,7 +458,7 @@ var RealtimeChannel = (function() {
 	};
 
 	RealtimeChannel.prototype.failPendingMessages = function(err) {
-		Logger.logAction(Logger.LOG_MINOR, 'RealtimeChannel.failPendingMessages', 'channel; name = ' + this.name + ', err = ' + err);
+		Logger.logAction(Logger.LOG_MINOR, 'RealtimeChannel.failPendingMessages', 'channel; name = ' + this.name + ', err = ' + Utils.inspectError(err));
 		for(var i = 0; i < this.pendingEvents.length; i++)
 			try {
 				this.pendingEvents[i].callback(err);

diff --git a/common/lib/transport/connectionmanager.js b/common/lib/transport/connectionmanager.js
@@ -159,7 +159,7 @@ var ConnectionManager = (function() {
 		/* first try to establish an http transport */
 		this.chooseHttpTransport(transportParams, function(err, httpTransport) {
 			if(err) {
-				Logger.logAction(Logger.LOG_ERROR, 'ConnectionManager.chooseTransport()', 'Unexpected error establishing transport; err = ' + err);
+				Logger.logAction(Logger.LOG_ERROR, 'ConnectionManager.chooseTransport()', 'Unexpected error establishing transport; err = ' + Utils.inspectError(err));
 				/* http failed, or terminal, so nothing's going to work */
 				callback(err);
 				return;
@@ -403,7 +403,7 @@ var ConnectionManager = (function() {
 			self.ackMessage(serial, count);
 		});
 		transport.on('nack', function(serial, count, err) {
-			Logger.logAction(Logger.LOG_ERROR, 'ConnectionManager on(nack)', 'serial = ' + serial + '; count = ' + count + '; err = ' + err);
+			Logger.logAction(Logger.LOG_ERROR, 'ConnectionManager on(nack)', 'serial = ' + serial + '; count = ' + count + '; err = ' + Utils.inspectError(err));
 			if(!err) {
 				err = new Error('Unknown error');
 				err.statusCode = 500;

diff --git a/common/lib/transport/transport.js b/common/lib/transport/transport.js
@@ -113,14 +113,14 @@ var Transport = (function() {
 	Transport.prototype.onDisconnect = function(message) {
 		this.isConnected = false;
 		var err = message && message.error;
-		Logger.logAction(Logger.LOG_MINOR, 'Transport.onDisconnect()', 'err = ' + err);
+		Logger.logAction(Logger.LOG_MINOR, 'Transport.onDisconnect()', 'err = ' + Utils.inspectError(err));
 		this.emit('disconnected', err);
 	};
 
 	Transport.prototype.onClose = function(message) {
 		this.isConnected = false;
 		var err = message && message.error;
-		Logger.logAction(Logger.LOG_MINOR, 'Transport.onClose()', 'err = ' + err);
+		Logger.logAction(Logger.LOG_MINOR, 'Transport.onClose()', 'err = ' + Utils.inspectError(err));
 		this.emit('closed', err);
 	};
 

diff --git a/common/lib/transport/websockettransport.js b/common/lib/transport/websockettransport.js
@@ -105,7 +105,7 @@ var WebSocketTransport = (function() {
 	};
 
 	WebSocketTransport.prototype.onWsError = function(err) {
-		Logger.logAction(Logger.LOG_ERROR, 'WebSocketTransport.onError()', 'Unexpected error from WebSocket: ' + err);
+		Logger.logAction(Logger.LOG_ERROR, 'WebSocketTransport.onError()', 'Unexpected error from WebSocket: ' + Utils.inspectError(err));
 		this.emit('wserror', err);
 		/* FIXME: this should not be fatal */
 		this.abort();

diff --git a/common/lib/util/utils.js b/common/lib/util/utils.js
@@ -234,5 +234,13 @@ var Utils = (function() {
  		return result;
 	};
 
+	Utils.inspect = function(x) {
+		return JSON.stringify(x);
+	};
+
+	Utils.inspectError = function(x) {
+		return (x && x.constructor.name == 'ErrorInfo') ? x.toString() : Utils.inspect(x);
+	};
+
 	return Utils;
 })();
diff --git a/nodejs/lib/transport/nodecomettransport.js b/nodejs/lib/transport/nodecomettransport.js
@@ -112,7 +112,7 @@ var NodeCometTransport = (function() {
 			}
 
 			res.on('error', self.onResError = function(err) {
-				console.log('incomingMessage error: ' + err);
+				console.log('incomingMessage error: ' + Utils.inspectError(err));
 				self.complete(err);
 			});