diff --git a/src/as/com/threerings/parlor/client/Invitation.as b/src/as/com/threerings/parlor/client/Invitation.as index 16b9057d..632491ee 100644 --- a/src/as/com/threerings/parlor/client/Invitation.as +++ b/src/as/com/threerings/parlor/client/Invitation.as @@ -175,11 +175,8 @@ public class Invitation } } catch (e :Error) { - var log :Log = Log.getLog(this); - log.warning("Invitation response observer choked on response " + - "[code=" + code + ", arg=" + arg + - ", invite=" + this + "]."); - log.logStackTrace(e); + Log.getLog(this).warning("Invitation response observer choked on response", + "code", code, "arg", arg, "invite", this, e); } // unless the invitation was countered, we can remove it from the diff --git a/src/as/com/threerings/parlor/client/ParlorDirector.as b/src/as/com/threerings/parlor/client/ParlorDirector.as index 6d665173..14338376 100644 --- a/src/as/com/threerings/parlor/client/ParlorDirector.as +++ b/src/as/com/threerings/parlor/client/ParlorDirector.as @@ -139,7 +139,7 @@ public class ParlorDirector extends BasicDirector // documentation inherited from interface public function gameIsReady (gameOid :int) :void { - _log.info("Handling game ready [goid=" + gameOid + "]."); + _log.info("Handling game ready", "goid", gameOid); // see what our observers have to say about it var handled :Boolean = false; @@ -170,8 +170,7 @@ public class ParlorDirector extends BasicDirector _handler.invitationReceived(invite); } catch (err :Error) { - _log.warning("Invitation handler choked on invite notification " + invite + "."); - _log.logStackTrace(err); + _log.warning("Invitation handler choked on invite notification", "invite", invite, err); } } @@ -181,8 +180,8 @@ public class ParlorDirector extends BasicDirector // look up the invitation record for this invitation var invite :Invitation = (_pendingInvites.get(remoteId) as Invitation); if (invite == null) { - _log.warning("Have no record of invitation for which we received a response?! " + - "[remoteId=" + remoteId + ", code=" + code + ", arg=" + arg + "]."); + _log.warning("Have no record of invitation for which we received a response?!", + "remoteId", remoteId, "code", code, "arg", arg); } else { invite.receivedResponse(code, arg); } diff --git a/src/as/com/threerings/parlor/client/TableDirector.as b/src/as/com/threerings/parlor/client/TableDirector.as index 5af065ec..c8b06588 100644 --- a/src/as/com/threerings/parlor/client/TableDirector.as +++ b/src/as/com/threerings/parlor/client/TableDirector.as @@ -185,15 +185,15 @@ public class TableDirector extends BasicDirector { // if we're already in a table, refuse the request if (_ourTable != null) { - log.warning("Ignoring request to create table as we're " + - "already in a table [table=" + _ourTable + "]."); + log.warning("Ignoring request to create table as we're already in a table", + "table", _ourTable); return; } // make sure we're currently in a place if (_tlobj == null) { - log.warning("Requested to create a table but we're not " + - "currently in a place [config=" + config + "]."); + log.warning("Requested to create a table but we're not currently in a place", + "config", config); return; } @@ -209,20 +209,20 @@ public class TableDirector extends BasicDirector { // if we're already in a table, refuse the request if (_ourTable != null) { - log.warning("Ignoring request to join table as we're " + - "already in a table [table=" + _ourTable + "]."); + log.warning("Ignoring request to join table as we're already in a table", + "table", _ourTable); return; } // make sure we're currently in a place if (_tlobj == null) { - log.warning("Requested to join a table but we're not " + - "currently in a place [tableId=" + tableId + "]."); + log.warning("Requested to join a table but we're not currently in a place", + "tableId", tableId); return; } // issue the join request - log.info("Joining table [tid=" + tableId + ", pos=" + position + "]."); + log.info("Joining table", "tid", tableId, "pos", position); _tlobj.getTableService().joinTable(_pctx.getClient(), tableId, position, this); } @@ -234,8 +234,8 @@ public class TableDirector extends BasicDirector { // make sure we're currently in a place if (_tlobj == null) { - log.warning("Requested to leave a table but we're not " + - "currently in a place [tableId=" + tableId + "]."); + log.warning("Requested to leave a table but we're not currently in a place", + "tableId", tableId); return; } @@ -250,8 +250,8 @@ public class TableDirector extends BasicDirector public function startTableNow (tableId :int) :void { if (_tlobj == null) { - log.warning("Requested to start a table but we're not " + - "currently in a place [tableId=" + tableId + "]."); + log.warning("Requested to start a table but we're not currently in a place", + "tableId", tableId); return; } @@ -264,8 +264,8 @@ public class TableDirector extends BasicDirector public function bootPlayer (tableId :int, target :Name) :void { if (_tlobj == null) { - log.warning("Requesting to boot a player from a table we're not currently in " + - "[tableId=" + tableId + ", target=" + target + "]."); + log.warning("Requesting to boot a player from a table we're not currently in", + "tableId", tableId, "target", target); return; } @@ -336,13 +336,13 @@ public class TableDirector extends BasicDirector var tableId :int = int(result); if (_tlobj == null) { // we've left, it's none of our concern anymore - log.info("Table created, but no lobby. [tableId=" + tableId + "]."); + log.info("Table created, but no lobby.", "tableId", tableId); return; } var table :Table = (_tlobj.getTables().get(tableId) as Table); if (table == null) { - log.warning("Table created, but where is it? [tableId=" + tableId + "]"); + log.warning("Table created, but where is it?", "tableId", tableId); return; }