From 1c538ac78ed510d099c7bf05ea05b4b66d2018cd Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 24 Sep 2009 20:18:14 +0000 Subject: [PATCH] Drive-by logging modernization. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5970 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/client/Communicator.as | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/as/com/threerings/presents/client/Communicator.as b/src/as/com/threerings/presents/client/Communicator.as index 1f791fc80..642b01a5d 100644 --- a/src/as/com/threerings/presents/client/Communicator.as +++ b/src/as/com/threerings/presents/client/Communicator.as @@ -165,7 +165,7 @@ public class Communicator try { _socket.close(); } catch (err :Error) { - log.warning("Error closing failed socket [error=" + err + "]."); + log.warning("Error closing failed socket", err); } } removeListeners(); @@ -227,7 +227,7 @@ public class Communicator protected function sendMessage (msg :UpstreamMessage) :void { if (_outStream == null) { - log.warning("No socket, dropping msg [msg=" + msg + "]."); + log.warning("No socket, dropping msg", "msg", msg); return; } @@ -263,14 +263,13 @@ public class Communicator try { msg = (_inStream.readObject(DownstreamMessage) as DownstreamMessage); } catch (e :Error) { - log.warning("Error processing downstream message: " + e); - log.logStackTrace(e); + log.warning("Error processing downstream message", e); return; } if (frameData.bytesAvailable > 0) { - log.warning("Beans! We didn't fully read a frame, is there a bug in some streaming " + - "code? [bytesLeftOver=" + frameData.bytesAvailable + ", msg=" + msg + "]."); + log.warning("Beans! We didn't fully read a frame, is there a bug in streaming code?", + "bytesLeftOver", frameData.bytesAvailable, "msg", msg); } if (_omgr != null) { @@ -336,8 +335,7 @@ public class Communicator } // total failure - log.warning("Socket error: " + event, "target", event.target); - Log.dumpStack(); + log.warning("Socket error", "event", event, "target", event.target, new Error()); shutdown(new Error(AuthCodes.NETWORK_ERROR)); } @@ -346,7 +344,7 @@ public class Communicator */ protected function socketClosed (event :Event) :void { - log.info("Socket was closed: " + event); + log.info("Socket was closed", "event", event); _client.notifyObservers(ClientEvent.CLIENT_CONNECTION_FAILED); // if we hadn't loaded our client object yet, behave as if this was a logon failure because // we failed before we dispatched a DID_LOGON