AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging varargification.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@848 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Ray Greenwell
2009-06-03 23:35:22 +00:00
parent cd138d2258
commit 82f877db99
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/server/TableManager.java
+14 -14
View File
@@ -146,7 +146,7 @@ public class TableManager
try { try {
table = _tableClass.newInstance(); table = _tableClass.newInstance();
} catch (Exception e) { } catch (Exception e) {
log.warning("Table.newInstance() failed [class=" + _tableClass + ", e=" + e + "]."); log.warning("Table.newInstance() failed", "class", _tableClass, e);
throw new InvocationException(INTERNAL_ERROR); throw new InvocationException(INTERNAL_ERROR);
} }
table.init(_dobj.getOid(), tableConfig, config); table.init(_dobj.getOid(), tableConfig, config);
@@ -156,8 +156,8 @@ public class TableManager
int cpos = (config.ais == null) ? 0 : config.ais.length; int cpos = (config.ais == null) ? 0 : config.ais.length;
String error = table.setPlayer(cpos, creator); String error = table.setPlayer(cpos, creator);
if (error != null) { if (error != null) {
log.warning("Unable to add creator to position zero of table!? [table=" + table + log.warning("Unable to add creator to position zero of table!?",
", creator=" + creator + ", error=" + error + "]."); "table", table, "creator", creator, "error", error);
// bail out now and abort the table creation process // bail out now and abort the table creation process
throw new InvocationException(error); throw new InvocationException(error);
} }
@@ -191,8 +191,8 @@ public class TableManager
// in which they are requesting to create a table // in which they are requesting to create a table
if (_dobj instanceof PlaceObject && if (_dobj instanceof PlaceObject &&
!((PlaceObject)_dobj).occupants.contains(creator.getOid())) { !((PlaceObject)_dobj).occupants.contains(creator.getOid())) {
log.warning("Requested to create a table in a place not occupied by the creator " + log.warning("Requested to create a table in a place not occupied by the creator",
"[creator=" + creator + ", ploid=" + _dobj.getOid() + "]."); "creator", creator, "ploid", _dobj.getOid());
throw new InvocationException(INTERNAL_ERROR); throw new InvocationException(INTERNAL_ERROR);
} }
@@ -265,8 +265,8 @@ public class TableManager
// remove the mapping from this user to the table // remove the mapping from this user to the table
if (null == notePlayerRemoved(leaver.getOid(), leaver)) { if (null == notePlayerRemoved(leaver.getOid(), leaver)) {
log.warning("No body to table mapping to clear? [leaver=" + leaver.who() + log.warning("No body to table mapping to clear?",
", table=" + table + "]."); "leaver", leaver.who(), "table", table);
} }
// either update or delete the table depending on whether or not we just removed the last // either update or delete the table depending on whether or not we just removed the last
@@ -326,8 +326,8 @@ public class TableManager
// Remove the player from the table // Remove the player from the table
if (notePlayerRemoved(table.bodyOids[position]) == null) { if (notePlayerRemoved(table.bodyOids[position]) == null) {
log.warning("No body to table mapping to clear? [position=" + position + log.warning("No body to table mapping to clear?",
", table=" + table + "]."); "position", position, "table", table);
} }
table.clearPlayerPos(position); table.clearPlayerPos(position);
updateTableInLobby(table); updateTableInLobby(table);
@@ -425,7 +425,7 @@ public class TableManager
return gobj.getOid(); return gobj.getOid();
} catch (Throwable t) { } catch (Throwable t) {
log.warning("Failed to create manager for game [config=" + table.config + "]: " + t); log.warning("Failed to create manager for game", "config", table.config, t);
throw new InvocationException(INTERNAL_ERROR); throw new InvocationException(INTERNAL_ERROR);
} }
} }
@@ -503,7 +503,7 @@ public class TableManager
if (table != null) { if (table != null) {
purgeTable(table); purgeTable(table);
} else { } else {
log.warning("Requested to unmap table that wasn't mapped [gameOid=" + gameOid + "]."); log.warning("Requested to unmap table that wasn't mapped", "gameOid", gameOid);
} }
} }
@@ -519,7 +519,7 @@ public class TableManager
Table table = _goidMap.get(gameOid); Table table = _goidMap.get(gameOid);
if (table == null) { if (table == null) {
log.warning("Unable to find table for running game [gameOid=" + gameOid + "]."); log.warning("Unable to find table for running game", "gameOid", gameOid);
return; return;
} }
@@ -543,8 +543,8 @@ public class TableManager
// remove this player from the table // remove this player from the table
if (!pender.clearPlayerByOid(bodyOid)) { if (!pender.clearPlayerByOid(bodyOid)) {
log.warning("Attempt to remove body from mapped table failed [table=" + pender + log.warning("Attempt to remove body from mapped table failed",
", bodyOid=" + bodyOid + "]."); "table", pender, "bodyOid", bodyOid);
return; return;
} }