From 688f2580ed7496d1ee834ca09180f889634938ae Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 26 Mar 2009 00:02:19 +0000 Subject: [PATCH] Varargified log calls. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5697 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../admin/client/ConfigEditorPanel.java | 2 +- .../threerings/admin/client/FieldEditor.java | 3 +- .../admin/server/ConfigRegistry.java | 30 ++++----- .../admin/server/DatabaseConfigRegistry.java | 2 +- .../bureau/client/BureauDirector.java | 4 +- .../bureau/server/BureauAuthenticator.java | 4 +- .../crowd/chat/client/ChatDirector.java | 4 +- .../crowd/chat/server/SpeakHandler.java | 5 +- .../crowd/chat/server/SpeakUtil.java | 3 +- .../crowd/client/LocationDirector.java | 39 ++++++----- .../crowd/client/PlaceViewUtil.java | 8 +-- .../threerings/crowd/server/BodyManager.java | 2 +- .../crowd/server/LocationManager.java | 8 +-- .../crowd/server/PlaceRegistry.java | 6 +- .../com/threerings/io/ObjectInputStream.java | 2 +- .../com/threerings/io/ObjectOutputStream.java | 6 +- src/java/com/threerings/io/Streamer.java | 13 ++-- .../presents/client/BlockingCommunicator.java | 21 +++--- .../presents/client/ClientCommunicator.java | 2 +- .../presents/client/ClientDObjectMgr.java | 11 ++-- .../presents/client/DeltaCalculator.java | 5 +- .../presents/client/InvocationDirector.java | 46 +++++++------ .../presents/data/InvocationMarshaller.java | 5 +- .../com/threerings/presents/dobj/DObject.java | 10 +-- .../presents/dobj/EntryRemovedEvent.java | 2 +- .../presents/dobj/EntryUpdatedEvent.java | 2 +- .../threerings/presents/net/PongResponse.java | 4 +- .../peer/server/PeerAuthenticator.java | 2 +- .../presents/peer/server/PeerManager.java | 30 ++++----- .../presents/peer/server/PeerNode.java | 7 +- .../presents/server/Authenticator.java | 2 +- .../presents/server/ClientManager.java | 20 +++--- .../presents/server/ClientResolver.java | 4 +- .../presents/server/InvocationDispatcher.java | 7 +- .../presents/server/InvocationManager.java | 44 ++++++------- .../presents/server/NativeSignalHandler.java | 2 +- .../presents/server/PresentsDObjectMgr.java | 64 +++++++++---------- .../presents/server/PresentsServer.java | 8 +-- .../presents/server/PresentsSession.java | 14 ++-- .../presents/server/RebootManager.java | 3 +- .../presents/server/ReportManager.java | 2 +- .../server/net/ConnectionManager.java | 27 ++++---- .../threerings/presents/util/ClassUtil.java | 7 +- .../com/threerings/util/MessageManager.java | 4 +- .../com/threerings/util/TrackedObject.java | 3 +- .../threerings/util/signal/SignalManager.java | 4 +- 46 files changed, 231 insertions(+), 272 deletions(-) diff --git a/src/java/com/threerings/admin/client/ConfigEditorPanel.java b/src/java/com/threerings/admin/client/ConfigEditorPanel.java index 20f5e7307..ac67e1f4e 100644 --- a/src/java/com/threerings/admin/client/ConfigEditorPanel.java +++ b/src/java/com/threerings/admin/client/ConfigEditorPanel.java @@ -123,7 +123,7 @@ public class ConfigEditorPanel extends JPanel // documentation inherited from interface public void requestFailed (String reason) { - log.warning("Failed to get config info [reason=" + reason + "]."); + log.warning("Failed to get config info", "reason", reason); } /** Our client context. */ diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/java/com/threerings/admin/client/FieldEditor.java index cc999c71f..eb82a47b0 100644 --- a/src/java/com/threerings/admin/client/FieldEditor.java +++ b/src/java/com/threerings/admin/client/FieldEditor.java @@ -154,8 +154,7 @@ public abstract class FieldEditor extends JPanel try { return _field.get(_object); } catch (Exception e) { - log.warning("Failed to fetch field [field=" + _field + - ", object=" + _object + ", error=" + e + "]."); + log.warning("Failed to fetch field", "field", _field, "object", _object, "error", e); return null; } } diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/java/com/threerings/admin/server/ConfigRegistry.java index 88b7492c7..c0a23b433 100644 --- a/src/java/com/threerings/admin/server/ConfigRegistry.java +++ b/src/java/com/threerings/admin/server/ConfigRegistry.java @@ -209,8 +209,7 @@ public abstract class ConfigRegistry try { value = object.getAttribute(event.getName()); } catch (ObjectAccessException oae) { - log.warning("Exception getting field [name=" + event.getName() + - ", exception=" + oae + "]."); + log.warning("Exception getting field", "name", event.getName(), "exception", oae); return; } updateValue(event.getName(), value); @@ -252,9 +251,8 @@ public abstract class ConfigRegistry } else if (value instanceof long[]) { setValue(key, (long[])value); } else { - log.info("Unable to flush config obj change [cobj=" + object.getClass().getName() + - ", key=" + key + ", type=" + value.getClass().getName() + - ", value=" + value + "]."); + log.info("Unable to flush config obj change", "cobj", object.getClass().getName(), + "key", key, "type", value.getClass().getName(), "value", value); } } @@ -327,19 +325,19 @@ public abstract class ConfigRegistry serialize(key, nameToKey(key), deserializedValue); } } catch (Exception e) { - log.warning("Failure decoding config value [type=" + type + - ", field=" + field + ", exception=" + e + "]."); + log.warning("Failure decoding config value", "type", type, "field", field, + "exception", e); } } else { - log.warning("Can't init field of unknown type " + - "[cobj=" + object.getClass().getName() + ", key=" + key + - ", type=" + type.getName() + "]."); + log.warning("Can't init field of unknown type", + "cobj", object.getClass().getName(), "key", key, + "type", type.getName()); } } catch (IllegalAccessException iae) { - log.warning("Can't set field [cobj=" + object.getClass().getName() + - ", key=" + key + ", error=" + iae + "]."); + log.warning("Can't set field", "cobj", object.getClass().getName(), "key", key, + "error", iae); } } @@ -353,17 +351,15 @@ public abstract class ConfigRegistry try { value = object.getAttribute(attributeName); } catch (ObjectAccessException oae) { - log.warning("Exception getting field [name=" + attributeName + - ", error=" + oae + "]."); + log.warning("Exception getting field", "name", attributeName, "error", oae); return; } if (value instanceof Streamable) { serialize(attributeName, key, value); } else { - log.info("Unable to flush config obj change [cobj=" + object.getClass().getName() + - ", key=" + key + ", type=" + value.getClass().getName() + - ", value=" + value + "]."); + log.info("Unable to flush config obj change", "cobj", object.getClass().getName(), + "key", key, "type", value.getClass().getName(), "value", value); } } diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index 7fdbb5d87..40c9f8141 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -133,7 +133,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry try { _data = _repo.loadConfig(_node, _path); } catch (DatabaseException pe) { - log.warning("Failed to load object configuration [path=" + _path + "].", pe); + log.warning("Failed to load object configuration", "path", _path, pe); _data = new HashMap(); } diff --git a/src/java/com/threerings/bureau/client/BureauDirector.java b/src/java/com/threerings/bureau/client/BureauDirector.java index 0fd92c610..400ee0762 100644 --- a/src/java/com/threerings/bureau/client/BureauDirector.java +++ b/src/java/com/threerings/bureau/client/BureauDirector.java @@ -102,7 +102,7 @@ public abstract class BureauDirector extends BasicDirector agent.init(agentObject); agent.start(); } catch (Throwable t) { - log.warning("Could not create agent [obj=" + agentObject + "]", t); + log.warning("Could not create agent", "obj", agentObject, t); _bureauService.agentCreationFailed(_ctx.getClient(), oid); return; } @@ -116,7 +116,7 @@ public abstract class BureauDirector extends BasicDirector */ protected synchronized void requestFailed (int oid, ObjectAccessException cause) { - log.warning("Could not subscribe to agent [oid=" + oid + "]", cause); + log.warning("Could not subscribe to agent", "oid", oid, cause); } @Override // from BasicDirector diff --git a/src/java/com/threerings/bureau/server/BureauAuthenticator.java b/src/java/com/threerings/bureau/server/BureauAuthenticator.java index 8229f02d0..fab9e8f6b 100644 --- a/src/java/com/threerings/bureau/server/BureauAuthenticator.java +++ b/src/java/com/threerings/bureau/server/BureauAuthenticator.java @@ -43,8 +43,8 @@ public class BureauAuthenticator extends ChainedAuthenticator rsp.getData().code = AuthResponseData.SUCCESS; } else { - log.warning("Received invalid bureau auth request [creds=" + - creds + "], problem: " + problem); + log.warning("Received invalid bureau auth request", + "creds", creds + "], problem: " + problem); rsp.getData().code = AuthCodes.SERVER_ERROR; } } diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index c9d33edb0..8fff27b4a 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -1017,8 +1017,8 @@ public class ChatDirector extends BasicDirector if (bundle != null && _msgmgr != null) { MessageBundle msgb = _msgmgr.getBundle(bundle); if (msgb == null) { - log.warning("No message bundle available to translate message " + - "[bundle=" + bundle + ", message=" + message + "]."); + log.warning("No message bundle available to translate message", "bundle", bundle, + "message", message); } else { message = msgb.xlate(message); } diff --git a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java index 245707f80..ffc3820f6 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java @@ -87,9 +87,8 @@ public class SpeakHandler // ensure that the speaker is valid if ((mode == ChatCodes.BROADCAST_MODE) || (_validator != null && !_validator.isValidSpeaker(_speakObj, caller, mode))) { - log.warning("Refusing invalid speak request [caller=" + caller.who() + - ", speakObj=" + _speakObj.which() + - ", message=" + message + ", mode=" + mode + "]."); + log.warning("Refusing invalid speak request", "caller", caller.who(), + "speakObj", _speakObj.which(), "message", message, "mode", mode); } else { // issue the speak message on our speak object diff --git a/src/java/com/threerings/crowd/chat/server/SpeakUtil.java b/src/java/com/threerings/crowd/chat/server/SpeakUtil.java index 84a4b9d3c..d15b0387a 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakUtil.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakUtil.java @@ -194,8 +194,7 @@ public class SpeakUtil _messageMapper.message = null; } else { - log.info("Unable to note listeners [dclass=" + speakObj.getClass() + - ", msg=" + msg + "]."); + log.info("Unable to note listeners", "dclass", speakObj.getClass(), "msg", msg); } } diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/java/com/threerings/crowd/client/LocationDirector.java index 148c50f43..918dda0ea 100644 --- a/src/java/com/threerings/crowd/client/LocationDirector.java +++ b/src/java/com/threerings/crowd/client/LocationDirector.java @@ -140,13 +140,13 @@ public class LocationDirector extends BasicDirector // if the pending request has been outstanding more than a minute, go ahead and let // this new one through in an attempt to recover from dropped moveTo requests if (refuse) { - log.warning("Refusing moveTo; We have a request outstanding " + - "[ppid=" + _pendingPlaceId + ", npid=" + placeId + "]."); + log.warning("Refusing moveTo; We have a request outstanding", + "ppid", _pendingPlaceId, "npid", placeId); return false; } else { - log.warning("Overriding stale moveTo request [ppid=" + _pendingPlaceId + - ", npid=" + placeId + "]."); + log.warning("Overriding stale moveTo request", "ppid", _pendingPlaceId, + "npid", placeId); } } @@ -166,7 +166,7 @@ public class LocationDirector extends BasicDirector // clear out our pending request oid int placeId = _pendingPlaceId; _pendingPlaceId = -1; - log.info("moveTo failed [pid=" + placeId + ", reason=" + reason + "]."); + log.info("moveTo failed", "pid", placeId, "reason", reason); // let our observers know that something has gone horribly awry handleFailure(placeId, reason); } @@ -258,8 +258,7 @@ public class LocationDirector extends BasicDirector try { _controller.mayLeavePlace(_plobj); } catch (Exception e) { - log.warning("Place controller choked in mayLeavePlace " + - "[plobj=" + _plobj + "].", e); + log.warning("Place controller choked in mayLeavePlace", "plobj", _plobj, e); } } } @@ -296,7 +295,7 @@ public class LocationDirector extends BasicDirector try { _controller = createController(config); if (_controller == null) { - log.warning("Place config returned null controller [config=" + config + "]."); + log.warning("Place config returned null controller", "config", config); return; } _controller.init(_ctx, config); @@ -308,8 +307,8 @@ public class LocationDirector extends BasicDirector } public void requestFailed (int oid, ObjectAccessException cause) { // aiya! we were unable to fetch our new place object; something is badly wrong - log.warning("Aiya! Unable to fetch place object for new location [plid=" + oid + - ", reason=" + cause + "]."); + log.warning("Aiya! Unable to fetch place object for new location", "plid", oid, + "reason", cause); // clear out our half initialized place info int placeId = _placeId; _placeId = -1; @@ -320,7 +319,7 @@ public class LocationDirector extends BasicDirector _subber.subscribe(_ctx.getDObjectManager()); } catch (Exception e) { - log.warning("Failed to create place controller [config=" + config + "].", e); + log.warning("Failed to create place controller", "config", config, e); handleFailure(_placeId, LocationCodes.E_INTERNAL_ERROR); } } @@ -343,8 +342,7 @@ public class LocationDirector extends BasicDirector try { _controller.didLeavePlace(_plobj); } catch (Exception e) { - log.warning("Place controller choked in didLeavePlace " + - "[plobj=" + _plobj + "].", e); + log.warning("Place controller choked in didLeavePlace", "plobj", _plobj, e); } } @@ -404,7 +402,7 @@ public class LocationDirector extends BasicDirector } public void requestFailed (int oid, ObjectAccessException cause) { log.warning("Location director unable to fetch body object; all has gone " + - "horribly wrong [cause=" + cause + "]."); + "horribly wrong", "cause", cause); } }; int cloid = client.getClientOid(); @@ -457,8 +455,7 @@ public class LocationDirector extends BasicDirector try { _controller.willEnterPlace(_plobj); } catch (Exception e) { - log.warning("Controller choked in willEnterPlace " + - "[place=" + _plobj + "].", e); + log.warning("Controller choked in willEnterPlace", "place", _plobj, e); } } @@ -479,12 +476,12 @@ public class LocationDirector extends BasicDirector // just finish up what we're doing and assume that the repeated move request was the // spurious one as it would be in the case of lag causing rapid-fire repeat requests if (movePending()) { - log.info("Dropping forced move because we have a move pending " + - "[pendId=" + _pendingPlaceId + ", reqId=" + placeId + "]."); + log.info("Dropping forced move because we have a move pending", + "pendId", _pendingPlaceId, "reqId", placeId); return; } - log.info("Moving at request of server [placeId=" + placeId + "]."); + log.info("Moving at request of server", "placeId", placeId); // clear out our old place information mayLeavePlace(); didLeavePlace(); @@ -505,8 +502,8 @@ public class LocationDirector extends BasicDirector if (_failureHandler != null) { log.warning("Requested to set failure handler, but we've already got one. The " + "conflicting entities will likely need to perform more sophisticated " + - "coordination to deal with failures. [old=" + _failureHandler + - ", new=" + handler + "]."); + "coordination to deal with failures.", + "old", _failureHandler, "new", handler); } else { _failureHandler = handler; diff --git a/src/java/com/threerings/crowd/client/PlaceViewUtil.java b/src/java/com/threerings/crowd/client/PlaceViewUtil.java index 9b0b9d5b9..c30bb1b9d 100644 --- a/src/java/com/threerings/crowd/client/PlaceViewUtil.java +++ b/src/java/com/threerings/crowd/client/PlaceViewUtil.java @@ -52,8 +52,8 @@ public class PlaceViewUtil try { ((PlaceView)root).willEnterPlace(plobj); } catch (Exception e) { - log.warning("Component choked on willEnterPlace() " + - "[component=" + root + ", plobj=" + plobj + "].", e); + log.warning("Component choked on willEnterPlace()", "component", root, + "plobj", plobj, e); } } @@ -84,8 +84,8 @@ public class PlaceViewUtil try { ((PlaceView)root).didLeavePlace(plobj); } catch (Exception e) { - log.warning("Component choked on didLeavePlace() " + - "[component=" + root + ", plobj=" + plobj + "].", e); + log.warning("Component choked on didLeavePlace()", "component", root, + "plobj", plobj, e); } } diff --git a/src/java/com/threerings/crowd/server/BodyManager.java b/src/java/com/threerings/crowd/server/BodyManager.java index 0f1047d2d..abe1dccbd 100644 --- a/src/java/com/threerings/crowd/server/BodyManager.java +++ b/src/java/com/threerings/crowd/server/BodyManager.java @@ -96,7 +96,7 @@ public class BodyManager } // update their status! - log.debug("Setting user idle state [user=" + bobj.username + ", status=" + nstatus + "]."); + log.debug("Setting user idle state", "user", bobj.username, "status", nstatus); updateOccupantStatus(bobj, nstatus); } diff --git a/src/java/com/threerings/crowd/server/LocationManager.java b/src/java/com/threerings/crowd/server/LocationManager.java index ec0fdd113..16821e375 100644 --- a/src/java/com/threerings/crowd/server/LocationManager.java +++ b/src/java/com/threerings/crowd/server/LocationManager.java @@ -81,8 +81,8 @@ public class LocationManager // make sure the place in question actually exists PlaceManager pmgr = _plreg.getPlaceManager(placeOid); if (pmgr == null) { - log.info("Requested to move to non-existent place [who=" + source.who() + - ", placeOid=" + placeOid + "]."); + log.info("Requested to move to non-existent place", "who", source.who(), + "placeOid", placeOid); throw new InvocationException(NO_SUCH_PLACE); } @@ -90,8 +90,8 @@ public class LocationManager // because we don't need to update anything in distributed object world Place place = pmgr.getLocation(); if (place.equals(source.location)) { - log.debug("Going along with client request to move to where they already are " + - "[source=" + source.who() + ", place=" + place + "]."); + log.debug("Going along with client request to move to where they already are", + "source", source.who(), "place", place); return pmgr.getConfig(); } diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index 90853fb11..2fdad325b 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java @@ -164,7 +164,7 @@ public class PlaceRegistry try { pmgr.shutdown(); } catch (Exception e) { - log.warning("Place manager failed shutting down [where=" + pmgr.where() + "].", e); + log.warning("Place manager failed shutting down", "where", pmgr.where(), e); } } } @@ -222,7 +222,7 @@ public class PlaceRegistry pmgr.startup(plobj); } catch (Exception e) { - log.warning("Error starting place manager [obj=" + plobj + ", pmgr=" + pmgr + "].", e); + log.warning("Error starting place manager", "obj", plobj, "pmgr", pmgr, e); } return pmgr; @@ -258,7 +258,7 @@ public class PlaceRegistry int ploid = pmgr.getPlaceObject().getOid(); // remove it from the table if (_pmgrs.remove(ploid) == null) { - log.warning("Requested to unmap unmapped place manager [pmgr=" + pmgr + "]."); + log.warning("Requested to unmap unmapped place manager", "pmgr", pmgr); // } else { // Log.info("Unmapped place manager [class=" + pmgr.getClass().getName() + diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/java/com/threerings/io/ObjectInputStream.java index bf015e040..d36fa6a80 100644 --- a/src/java/com/threerings/io/ObjectInputStream.java +++ b/src/java/com/threerings/io/ObjectInputStream.java @@ -181,7 +181,7 @@ public class ObjectInputStream extends DataInputStream Class sclass = Class.forName(cname, true, _loader); Streamer streamer = Streamer.getStreamer(sclass); if (STREAM_DEBUG) { - log.info(hashCode() + ": New class '" + cname + "' [code=" + code + "]."); + log.info(hashCode() + ": New class '" + cname + "'", "code", code); } // sanity check diff --git a/src/java/com/threerings/io/ObjectOutputStream.java b/src/java/com/threerings/io/ObjectOutputStream.java index 74aa08bf1..a91834f70 100644 --- a/src/java/com/threerings/io/ObjectOutputStream.java +++ b/src/java/com/threerings/io/ObjectOutputStream.java @@ -100,8 +100,8 @@ public class ObjectOutputStream extends DataOutputStream // constructor because we want to be sure not to call _nextCode++ if getStreamer() // throws an exception if (ObjectInputStream.STREAM_DEBUG) { - log.info(hashCode() + ": Creating class mapping [code=" + _nextCode + - ", class=" + sclass.getName() + "]."); + log.info(hashCode() + ": Creating class mapping", "code", _nextCode, + "class", sclass.getName()); } cmap = createClassMapping(_nextCode++, sclass, streamer); _classmap.put(sclass, cmap); @@ -205,7 +205,7 @@ public class ObjectOutputStream extends DataOutputStream throw new RuntimeException("defaultWriteObject() called illegally."); } -// log.info("Writing default [cmap=" + _streamer + ", current=" + _current + "]."); +// log.info("Writing default", "cmap", _streamer, "current", _current); // write the instance data _streamer.writeObject(_current, this, false); diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java index a2afca583..448278044 100644 --- a/src/java/com/threerings/io/Streamer.java +++ b/src/java/com/threerings/io/Streamer.java @@ -153,7 +153,7 @@ public class Streamer if (useWriter && _writer != null) { try { if (ObjectInputStream.STREAM_DEBUG) { - log.info("Writing with writer [class=" + _target.getName() + "]."); + log.info("Writing with writer", "class", _target.getName()); } _writer.invoke(object, new Object[] { out }); @@ -228,8 +228,7 @@ public class Streamer } try { if (ObjectInputStream.STREAM_DEBUG) { - log.info("Writing field [class=" + _target.getName() + - ", field=" + field.getName() + "]."); + log.info("Writing field", "class", _target.getName(), "field", field.getName()); } fm.writeField(field, object, out); } catch (Exception e) { @@ -382,8 +381,8 @@ public class Streamer if (in.available() > 0) { fm.readField(field, object, in); } else { - log.info("Streamed instance missing field (probably newly added) " + - "[class=" + _target.getName() + ", field=" + field.getName() + "]."); + log.info("Streamed instance missing field (probably newly added)", + "class", _target.getName(), "field", field.getName()); } } catch (Exception e) { String errmsg = "Failure reading streamable field [class=" + _target.getName() + @@ -427,8 +426,8 @@ public class Streamer try { isInner = (_target.getDeclaringClass() != null); } catch (Throwable t) { - log.warning("Failure checking innerness of class [class=" + _target.getName() + - ", error=" + t + "]."); + log.warning("Failure checking innerness of class", "class", _target.getName(), + "error", t); } if (isInner && !isStatic) { throw new IllegalArgumentException( diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index 020d875ba..d4b35415c 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -380,12 +380,12 @@ public class BlockingCommunicator extends Communicator ByteBuffer buffer = _fout.frameAndReturnBuffer(); if (buffer.limit() > 4096) { String txt = StringUtil.truncate(String.valueOf(msg), 80, "..."); - log.info("Whoa, writin' a big one [msg=" + txt + ", size=" + buffer.limit() + "]."); + log.info("Whoa, writin' a big one", "msg", txt, "size", buffer.limit()); } int wrote = _channel.write(buffer); if (wrote != buffer.limit()) { - log.warning("Aiya! Couldn't write entire message [msg=" + msg + - ", size=" + buffer.limit() + ", wrote=" + wrote + "]."); + log.warning("Aiya! Couldn't write entire message", "msg", msg, + "size", buffer.limit(), "wrote", wrote); // } else { // Log.info("Wrote " + wrote + " bytes."); } @@ -416,8 +416,7 @@ public class BlockingCommunicator extends Communicator ByteBuffer buf = _bout.flip(); int size = buf.remaining(); if (size > Client.MAX_DATAGRAM_SIZE) { - log.warning("Dropping oversized datagram [size=" + size + - ", msg=" + msg + "]."); + log.warning("Dropping oversized datagram", "size", size, "msg", msg); return; } @@ -496,7 +495,7 @@ public class BlockingCommunicator extends Communicator { // the default implementation just connects to the first port and does no cycling int port = _client.getPorts()[0]; - log.info("Connecting [host=" + host + ", port=" + port + "]."); + log.info("Connecting", "host", host, "port", port); synchronized (BlockingCommunicator.this) { _channel = SocketChannel.open(new InetSocketAddress(host, port)); } @@ -709,7 +708,7 @@ public class BlockingCommunicator extends Communicator try { connect(); } catch (IOException ioe) { - log.warning("Failed to open datagram channel [error=" + ioe + "]."); + log.warning("Failed to open datagram channel", "error", ioe); shutdown(); } } @@ -765,7 +764,7 @@ public class BlockingCommunicator extends Communicator // check if we managed to establish a connection if (cport > 0) { - log.info("Datagram connection established [port=" + cport + "]."); + log.info("Datagram connection established", "port", cport); // start up the writer thread _datagramWriter = new DatagramWriter(); @@ -819,10 +818,10 @@ public class BlockingCommunicator extends Communicator log.debug("Datagram reader thread woken up in time to die."); } catch (IOException ioe) { - log.warning("Error receiving datagram [error=" + ioe + "]."); + log.warning("Error receiving datagram", "error", ioe); } catch (Exception e) { - log.warning("Error processing message [msg=" + msg + ", error=" + e + "]."); + log.warning("Error processing message", "msg", msg, "error", e); } } @@ -875,7 +874,7 @@ public class BlockingCommunicator extends Communicator sendDatagram(msg); } catch (IOException ioe) { - log.warning("Error sending datagram [error=" + ioe + "]."); + log.warning("Error sending datagram", "error", ioe); } } diff --git a/src/java/com/threerings/presents/client/ClientCommunicator.java b/src/java/com/threerings/presents/client/ClientCommunicator.java index e776c58c3..057170fbb 100644 --- a/src/java/com/threerings/presents/client/ClientCommunicator.java +++ b/src/java/com/threerings/presents/client/ClientCommunicator.java @@ -81,7 +81,7 @@ public class ClientCommunicator extends BlockingCommunicator for (int ii = 0; ii < ports.length; ii++) { int port = ports[(ii+ppidx)%ports.length]; int nextPort = ports[(ii+ppidx+1)%ports.length]; - log.info("Connecting [host=" + host + ", port=" + port + "]."); + log.info("Connecting", "host", host, "port", port); InetSocketAddress addr = new InetSocketAddress(host, port); try { synchronized (this) { diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index 4b233dc37..d465cff19 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -195,7 +195,7 @@ public class ClientDObjectMgr } else if (obj instanceof UnsubscribeResponse) { int oid = ((UnsubscribeResponse)obj).getOid(); if (_dead.remove(oid) == null) { - log.warning("Received unsub ACK from unknown object [oid=" + oid + "]."); + log.warning("Received unsub ACK from unknown object", "oid", oid); } } else if (obj instanceof FailureResponse) { @@ -339,8 +339,7 @@ public class ClientDObjectMgr // let the penders know that the object is available PendingRequest req = _penders.remove(obj.getOid()); if (req == null) { - log.warning("Got object, but no one cares?! [oid=" + obj.getOid() + - ", obj=" + obj + "]."); + log.warning("Got object, but no one cares?!", "oid", obj.getOid(), "obj", obj); return; } @@ -362,7 +361,7 @@ public class ClientDObjectMgr // let the penders know that the object is not available PendingRequest req = _penders.remove(oid); if (req == null) { - log.warning("Failed to get object, but no one cares?! [oid=" + oid + "]."); + log.warning("Failed to get object, but no one cares?!", "oid", oid); return; } @@ -424,8 +423,8 @@ public class ClientDObjectMgr dobj.removeSubscriber(target); } else { - log.info("Requested to remove subscriber from non-proxied object [oid=" + oid + - ", sub=" + target + "]."); + log.info("Requested to remove subscriber from non-proxied object", "oid", oid, + "sub", target); } } diff --git a/src/java/com/threerings/presents/client/DeltaCalculator.java b/src/java/com/threerings/presents/client/DeltaCalculator.java index 63abe50d6..c4738b9b3 100644 --- a/src/java/com/threerings/presents/client/DeltaCalculator.java +++ b/src/java/com/threerings/presents/client/DeltaCalculator.java @@ -96,9 +96,8 @@ public class DeltaCalculator // minus the server's send time (plus network delay): dT = C - S _deltas[_iter] = recv - (server + nettime); - log.debug("Calculated delta [delay=" + delay + - ", nettime=" + nettime + ", delta=" + _deltas[_iter] + - ", rtt=" + (recv-send) + "]."); + log.debug("Calculated delta", "delay", delay, "nettime", nettime, "delta", _deltas[_iter], + "rtt", (recv-send)); return (++_iter >= CLOCK_SYNC_PING_COUNT); } diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index cdbb7818d..0f76e02f9 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -94,8 +94,8 @@ public class InvocationDirector public void requestFailed (int oid, ObjectAccessException cause) { // aiya! we were unable to subscribe to the client object. we're hosed! - log.warning("Invocation director unable to subscribe to client object " + - "[cloid=" + cloid + ", cause=" + cause + "]!"); + log.warning("Invocation director unable to subscribe to client object", + "cloid", cloid, "cause", cause + "]!"); _client.getClientObjectFailed(cause); } }); @@ -148,8 +148,8 @@ public class InvocationDirector if (_clobj != null) { Registration rreg = _clobj.receivers.get(receiverCode); if (rreg == null) { - log.warning("Receiver unregistered for which we have no id to code mapping " + - "[code=" + receiverCode + "]."); + log.warning("Receiver unregistered for which we have no id to code mapping", + "code", receiverCode); } else { // Object decoder = _receivers.remove(rreg.receiverId); // Log.info("Cleared receiver " + StringUtil.shortClassName(decoder) + @@ -206,8 +206,8 @@ public class InvocationDirector int invOid, int invCode, int methodId, Object[] args, Transport transport) { if (_clobj == null) { - log.warning("Dropping invocation request on shutdown director [code=" + invCode + - ", methodId=" + methodId + "]."); + log.warning("Dropping invocation request on shutdown director", "code", invCode, + "methodId", methodId); return; } @@ -270,23 +270,22 @@ public class InvocationDirector // look up the invocation marshaller registered for that response ListenerMarshaller listener = _listeners.remove(reqId); if (listener == null) { - log.warning("Received invocation response for which we have no registered listener " + - "[reqId=" + reqId + ", methId=" + methodId + ", args=" + - StringUtil.toString(args) + "]. It is possible that this listener was " + - "flushed because the response did not arrive within " + - LISTENER_MAX_AGE + " milliseconds."); + log.warning("Received invocation response for which we have no registered listener. " + + "It is possible that this listener was flushed because the response did " + + "not arrive within " + LISTENER_MAX_AGE + " milliseconds.", + "reqId", reqId, "methId", methodId, "args", args); return; } -// Log.info("Dispatching invocation response [listener=" + listener + -// ", methId=" + methodId + ", args=" + StringUtil.toString(args) + "]."); +// log.info("Dispatching invocation response", "listener", listener, +// "methId", methodId, "args", args); // dispatch the response try { listener.dispatchResponse(methodId, args); } catch (Throwable t) { - log.warning("Invocation response listener choked [listener=" + listener + - ", methId=" + methodId + ", args=" + StringUtil.toString(args) + "].", t); + log.warning("Invocation response listener choked", "listener", listener, + "methId", methodId, "args", args, t); } // flush expired listeners periodically @@ -305,20 +304,19 @@ public class InvocationDirector // look up the decoder registered for this receiver InvocationDecoder decoder = _receivers.get(receiverId); if (decoder == null) { - log.warning("Received notification for which we have no registered receiver " + - "[recvId=" + receiverId + ", methodId=" + methodId + - ", args=" + StringUtil.toString(args) + "]."); + log.warning("Received notification for which we have no registered receiver", + "recvId", receiverId, "methodId", methodId, "args", args); return; } -// Log.info("Dispatching invocation notification [receiver=" + decoder.receiver + -// ", methodId=" + methodId + ", args=" + StringUtil.toString(args) + "]."); +// log.info("Dispatching invocation notification", "receiver", decoder.receiver, +// "methodId", methodId, "args", args); try { decoder.dispatchNotification(methodId, args); } catch (Throwable t) { - log.warning("Invocation notification receiver choked [receiver=" + decoder.receiver + - ", methId=" + methodId + ", args=" + StringUtil.toString(args) + "].", t); + log.warning("Invocation notification receiver choked", "receiver", decoder.receiver, + "methId", methodId, "args", args, t); } } @@ -357,8 +355,8 @@ public class InvocationDirector } public void requestFailed (int oid, ObjectAccessException cause) { - log.warning("Aiya! Unable to subscribe to changed client object [cloid=" + oid + - ", cause=" + cause + "]."); + log.warning("Aiya! Unable to subscribe to changed client object", "cloid", oid, + "cause", cause); } }); } diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/java/com/threerings/presents/data/InvocationMarshaller.java index 67a013098..8cb5f3b03 100644 --- a/src/java/com/threerings/presents/data/InvocationMarshaller.java +++ b/src/java/com/threerings/presents/data/InvocationMarshaller.java @@ -106,9 +106,8 @@ public class InvocationMarshaller listener.requestFailed((String)args[0]); } else { - log.warning("Requested to dispatch unknown invocation response " + - "[listener=" + listener + ", methodId=" + methodId + - ", args=" + StringUtil.toString(args) + "]."); + log.warning("Requested to dispatch unknown invocation response", + "listener", listener, "methodId", methodId, "args", args); } } diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index 32fd16371..b13de5731 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -357,7 +357,7 @@ public class DObject // clear the lock from the list if (ListUtil.clear(_locks, name) == null) { // complain if we didn't find the lock - log.info("Unable to clear non-existent lock [lock=" + name + ", dobj=" + this + "]."); + log.info("Unable to clear non-existent lock", "lock", name, "dobj", this); } } @@ -438,8 +438,8 @@ public class DObject } } catch (Exception e) { - log.warning("Listener choked during notification [list=" + listener + - ", event=" + event + "].", e); + log.warning("Listener choked during notification", "list", listener, + "event", event, e); } } } @@ -551,8 +551,8 @@ public class DObject _omgr.postEvent(event); } else { - log.info("Dropping event for non- or no longer managed object [oid=" + getOid() + - ", class=" + getClass().getName() + ", event=" + event + "]."); + log.info("Dropping event for non- or no longer managed object", "oid", getOid(), + "class", getClass().getName(), "event", event); } } diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java index 3b20462a9..b58f4313a 100644 --- a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java @@ -91,7 +91,7 @@ public class EntryRemovedEvent extends NamedEvent _oldEntry = set.removeKey(_key); if (_oldEntry == null) { // complain if there was actually nothing there - log.warning("No matching entry to remove [key=" + _key + ", set=" + set + "]."); + log.warning("No matching entry to remove", "key", _key, "set", set); return false; } } diff --git a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java index 56567c727..7427c2b2d 100644 --- a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java @@ -110,7 +110,7 @@ public class EntryUpdatedEvent extends NamedEvent _oldEntry = set.update(_entry); if (_oldEntry == null) { // complain if we didn't update anything - log.warning("No matching entry to update [entry=" + this + ", set=" + set + "]."); + log.warning("No matching entry to update", "entry", this, "set", set); return false; } } diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java index ed604c8a1..8aca75cee 100644 --- a/src/java/com/threerings/presents/net/PongResponse.java +++ b/src/java/com/threerings/presents/net/PongResponse.java @@ -92,8 +92,8 @@ public class PongResponse extends DownstreamMessage // the time spent between unpacking the ping and packing the pong is the processing delay if (_pingStamp == 0L) { - log.warning("Pong response written that was not constructed " + - "with a valid ping stamp [rsp=" + this + "]."); + log.warning("Pong response written that was not constructed with a valid ping stamp", + "rsp", this); _processDelay = 0; } else { _processDelay = (int)(_packStamp - _pingStamp); diff --git a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java index 18d41bead..fc557a34b 100644 --- a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java +++ b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java @@ -62,7 +62,7 @@ public class PeerAuthenticator extends ChainedAuthenticator rsp.getData().code = AuthResponseData.SUCCESS; } else { - log.warning("Received invalid peer auth request? [creds=" + pcreds + "]."); + log.warning("Received invalid peer auth request?", "creds", pcreds); rsp.getData().code = AuthCodes.SERVER_ERROR; } } diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index d7a558a0d..3322f9dec 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -427,7 +427,7 @@ public abstract class PeerManager Tuple key = Tuple.newTuple(nodeName, remoteOid); Tuple, DObject> bits = _proxies.remove(key); if (bits == null) { - log.warning("Requested to clear unknown proxy [key=" + key + "]."); + log.warning("Requested to clear unknown proxy", "key", key); return; } @@ -436,7 +436,7 @@ public abstract class PeerManager final Client peer = getPeerClient(nodeName); if (peer == null) { - log.warning("Unable to unsubscribe from proxy, missing peer [key=" + key + "]."); + log.warning("Unable to unsubscribe from proxy, missing peer", "key", key); return; } @@ -528,8 +528,8 @@ public abstract class PeerManager } } else { if (result != null) { - log.warning("Tried to release lock held by another peer [lock=" + lock + - ", owner=" + result + "]."); + log.warning("Tried to release lock held by another peer", "lock", lock, + "owner", result); } listener.requestCompleted(result); } @@ -550,8 +550,8 @@ public abstract class PeerManager // make sure we're releasing it LockHandler handler = _locks.get(lock); if (handler == null || !handler.getNodeName().equals(_nodeName) || handler.isAcquiring()) { - log.warning("Tried to reacquire lock not being released [lock=" + lock + - ", handler=" + handler + "]."); + log.warning("Tried to reacquire lock not being released", "lock", lock, + "handler", handler); return; } @@ -621,12 +621,12 @@ public abstract class PeerManager // some other peer beat us to it operation.fail(nodeName); if (nodeName == null) { - log.warning("Lock acquired by null? [lock=" + lock + "]."); + log.warning("Lock acquired by null?", "lock", lock); } } } public void requestFailed (Exception cause) { - log.warning("Lock acquisition failed [lock=" + lock + "].", cause); + log.warning("Lock acquisition failed", "lock", lock, cause); operation.fail(null); } }); @@ -787,8 +787,8 @@ public abstract class PeerManager // sanity check if (_nodeobj.clients.contains(clinfo)) { - log.warning("Received clientSessionDidStart() for already registered client!? " + - "[old=" + _nodeobj.clients.get(clinfo.getKey()) + ", new=" + clinfo + "]."); + log.warning("Received clientSessionDidStart() for already registered client!?", + "old", _nodeobj.clients.get(clinfo.getKey()), "new", clinfo); // go ahead and update the record _nodeobj.updateClients(clinfo); } else { @@ -821,7 +821,7 @@ public abstract class PeerManager return; } } - log.warning("Session ended for unregistered client [who=" + username + "]."); + log.warning("Session ended for unregistered client", "who", username); } /** @@ -1127,8 +1127,8 @@ public abstract class PeerManager (_timeout = new Interval(_omgr) { @Override public void expired () { - log.warning("Lock handler timed out, acting anyway [lock=" + _lock + - ", acquire=" + _acquire + "]."); + log.warning("Lock handler timed out, acting anyway", "lock", _lock, + "acquire", _acquire); activate(); } }).schedule(LOCK_TIMEOUT); @@ -1175,8 +1175,8 @@ public abstract class PeerManager return; } if (!_remoids.remove(caller.getOid())) { - log.warning("Received unexpected ratification [handler=" + this + - ", who=" + caller.who() + "]."); + log.warning("Received unexpected ratification", "handler", this, + "who", caller.who()); } maybeActivate(); } diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index 9b67fc70d..dd098cba4 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -220,8 +220,7 @@ public class PeerNode // documentation inherited from interface Subscriber public void requestFailed (int oid, ObjectAccessException cause) { - log.warning("Failed to subscribe to peer's node object " + - "[peer=" + _record + ", cause=" + cause + "]."); + log.warning("Failed to subscribe to peer's node object", "peer", _record, "cause", cause); } /** @@ -262,8 +261,8 @@ public class PeerNode PeerManager.LockHandler handler = _peermgr.getLockHandler(lock); if (handler == null) { if (_peermgr.getNodeObject().locks.contains(lock)) { - log.warning("Peer trying to acquire lock owned by this node " + - "[lock=" + lock + ", node=" + _record.nodeName + "]."); + log.warning("Peer trying to acquire lock owned by this node", "lock", lock, + "node", _record.nodeName); return; } _peermgr.createLockHandler(PeerNode.this, lock, true); diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/java/com/threerings/presents/server/Authenticator.java index edc1390b1..f57b0b24b 100644 --- a/src/java/com/threerings/presents/server/Authenticator.java +++ b/src/java/com/threerings/presents/server/Authenticator.java @@ -56,7 +56,7 @@ public abstract class Authenticator try { processAuthentication(conn, rsp); } catch (Exception e) { - log.warning("Error authenticating user [areq=" + req + "].", e); + log.warning("Error authenticating user", "areq", req, e); rdata.code = AuthCodes.SERVER_ERROR; } return true; diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 09ec5c810..3e5a3b16d 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -129,7 +129,7 @@ public class ClientManager // from interface ShutdownManager.Shutdowner public void shutdown () { - log.info("Client manager shutting down [ccount=" + _usermap.size() + "]."); + log.info("Client manager shutting down", "ccount", _usermap.size()); _flushClients.cancel(); @@ -139,8 +139,8 @@ public class ClientManager try { pc.shutdown(); } catch (Exception e) { - log.warning("Client choked in shutdown() [client=" + - StringUtil.safeToString(pc) + "].", e); + log.warning("Client choked in shutdown()", + "client", StringUtil.safeToString(pc), e); } } } @@ -429,8 +429,7 @@ public class ClientManager // remove the client from the connection map PresentsSession client = _conmap.remove(conn); if (client != null) { - log.info("Unmapped failed client [client=" + client + ", conn=" + conn + - ", fault=" + fault + "]."); + log.info("Unmapped failed client", "client", client, "conn", conn, "fault", fault); // let the client know the connection went away client.wasUnmapped(); // and let the client know things went haywire @@ -449,7 +448,7 @@ public class ClientManager // remove the client from the connection map PresentsSession client = _conmap.remove(conn); if (client != null) { - log.debug("Unmapped client [client=" + client + ", conn=" + conn + "]."); + log.debug("Unmapped client", "client", client, "conn", conn); // let the client know the connection went away client.wasUnmapped(); @@ -545,11 +544,11 @@ public class ClientManager // now end their sessions for (PresentsSession client : victims) { try { - log.info("Client expired, ending session [session=" + client + - ", dtime=" + (now-client.getNetworkStamp()) + "ms]."); + log.info("Client expired, ending session", "session", client, + "dtime", (now-client.getNetworkStamp()) + "ms]."); client.endSession(); } catch (Exception e) { - log.warning("Choke while flushing client [victim=" + client + "].", e); + log.warning("Choke while flushing client", "victim", client, e); } } } @@ -567,8 +566,7 @@ public class ClientManager _clop.apply(clobj); } catch (Exception e) { - log.warning("Client op failed [username=" + username + - ", clop=" + _clop + "].", e); + log.warning("Client op failed", "username", username, "clop", _clop, e); } finally { releaseClientObject(username); diff --git a/src/java/com/threerings/presents/server/ClientResolver.java b/src/java/com/threerings/presents/server/ClientResolver.java index 2cf983485..81954662d 100644 --- a/src/java/com/threerings/presents/server/ClientResolver.java +++ b/src/java/com/threerings/presents/server/ClientResolver.java @@ -192,8 +192,8 @@ public class ClientResolver extends Invoker.Unit try { crl.resolutionFailed(_username, cause); } catch (Exception e) { - log.warning("Client resolution listener choked in resolutionFailed() [crl=" + crl + - ", username=" + _username + ", cause=" + cause + "].", e); + log.warning("Client resolution listener choked in resolutionFailed()", "crl", crl, + "username", _username, "cause", cause, e); } } } diff --git a/src/java/com/threerings/presents/server/InvocationDispatcher.java b/src/java/com/threerings/presents/server/InvocationDispatcher.java index 3d375fc9e..9e7a0f117 100644 --- a/src/java/com/threerings/presents/server/InvocationDispatcher.java +++ b/src/java/com/threerings/presents/server/InvocationDispatcher.java @@ -48,10 +48,7 @@ public abstract class InvocationDispatcher public void dispatchRequest (ClientObject source, int methodId, Object[] args) throws InvocationException { - log.warning("Requested to dispatch unknown method " + - "[provider=" + provider + - ", sourceOid=" + source.getOid() + - ", methodId=" + methodId + - ", args=" + StringUtil.toString(args) + "]."); + log.warning("Requested to dispatch unknown method", "provider", provider, + "sourceOid", source.getOid(), "methodId", methodId, "args", args); } } diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 0a216d356..1197055de 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -83,7 +83,7 @@ public class InvocationManager invobj.addListener(this); _invoid = invobj.getOid(); -// log.info("Created invocation service object [oid=" + _invoid + "]."); +// log.info("Created invocation service object", "oid", _invoid); } /** @@ -151,7 +151,7 @@ public class InvocationManager _recentRegServices.put(Integer.valueOf(invCode), marsh.getClass().getName()); -// log.info("Registered service [marsh=" + marsh + "]."); +// log.info("Registered service", "marsh", marsh); return marsh; } @@ -169,8 +169,8 @@ public class InvocationManager } if (_dispatchers.remove(marsh.getInvocationCode()) == null) { - log.warning("Requested to remove unregistered marshaller? " + - "[marsh=" + marsh + "].", new Exception()); + log.warning("Requested to remove unregistered marshaller?", "marsh", marsh, + new Exception()); } } @@ -224,21 +224,17 @@ public class InvocationManager // make sure the client is still around ClientObject source = (ClientObject)_omgr.getObject(clientOid); if (source == null) { - log.info("Client no longer around for invocation " + - "request [clientOid=" + clientOid + - ", code=" + invCode + ", methId=" + methodId + - ", args=" + StringUtil.toString(args) + "]."); + log.info("Client no longer around for invocation request", "clientOid", clientOid, + "code", invCode, "methId", methodId, "args", args); return; } // look up the dispatcher InvocationDispatcher disp = _dispatchers.get(invCode); if (disp == null) { - log.info("Received invocation request but dispatcher " + - "registration was already cleared [code=" + invCode + - ", methId=" + methodId + - ", args=" + StringUtil.toString(args) + ", marsh=" + - _recentRegServices.get(Integer.valueOf(invCode)) + "]."); + log.info("Received invocation request but dispatcher registration was already cleared", + "code", invCode, "methId", methodId, "args", args, + "marsh", _recentRegServices.get(Integer.valueOf(invCode))); return; } @@ -259,9 +255,8 @@ public class InvocationManager } } -// log.debug("Dispatching invreq [caller=" + source.who() + -// ", disp=" + disp + ", methId=" + methodId + -// ", args=" + StringUtil.toString(args) + "]."); +// log.debug("Dispatching invreq", "caller", source.who(), "disp", disp, +// "methId", methodId, "args", args); // dispatch the request try { @@ -276,18 +271,14 @@ public class InvocationManager rlist.requestFailed(ie.getMessage()); } else { - log.warning("Service request failed but we've got no " + - "listener to inform of the failure " + - "[caller=" + source.who() + ", code=" + invCode + - ", dispatcher=" + disp + ", methodId=" + methodId + - ", args=" + StringUtil.toString(args) + - ", error=" + ie + "]."); + log.warning("Service request failed but we've got no listener to inform of " + + "the failure", "caller", source.who(), "code", invCode, + "dispatcher", disp, "methodId", methodId, "args", args, "error", ie); } } catch (Throwable t) { - log.warning("Dispatcher choked [disp=" + disp + - ", caller=" + source.who() + ", methId=" + methodId + - ", args=" + StringUtil.toString(args) + "].", t); + log.warning("Dispatcher choked", "disp", disp, "caller", source.who(), + "methId", methodId, "args", args, t); // avoid logging an error when the listener notices that it's been ignored. if (rlist != null) { @@ -321,7 +312,8 @@ public class InvocationManager /** Tracks recently registered services so that we can complain informatively if a request * comes in on a service we don't know about. */ - protected final Map _recentRegServices = new LRUHashMap(10000); + protected final Map _recentRegServices = + new LRUHashMap(10000); /** The text appended to the procedure name when generating a failure response. */ protected static final String FAILED_SUFFIX = "Failed"; diff --git a/src/java/com/threerings/presents/server/NativeSignalHandler.java b/src/java/com/threerings/presents/server/NativeSignalHandler.java index 03548c4d5..dd4a0a1f8 100644 --- a/src/java/com/threerings/presents/server/NativeSignalHandler.java +++ b/src/java/com/threerings/presents/server/NativeSignalHandler.java @@ -45,7 +45,7 @@ public class NativeSignalHandler extends AbstractSignalHandler hupReceived(); break; default: - log.warning("Received unknown signal [signo=" + signo + "]."); + log.warning("Received unknown signal", "signo", signo); break; } return true; diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index b76b8a429..4af8390cf 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -156,8 +156,8 @@ public class PresentsDObjectMgr // originating manager after converting them back to the original oid _proxies.put(object.getOid(), new ProxyReference(origObjectId, omgr)); // TEMP: report what we're doing as we're seeing funny business - log.info("Registered proxy object [type=" + object.getClass().getName() + - ", remoid=" + origObjectId + ", locoid=" + object.getOid() + "]."); + log.info("Registered proxy object", "type", object.getClass().getName(), + "remoid", origObjectId, "locoid", object.getOid()); } /** @@ -168,12 +168,12 @@ public class PresentsDObjectMgr public void clearProxyObject (int origObjectId, DObject object) { if (_proxies.remove(object.getOid()) == null) { - log.warning("Missing proxy mapping for cleared proxy [ooid=" + origObjectId + "]."); + log.warning("Missing proxy mapping for cleared proxy", "ooid", origObjectId); } _objects.remove(object.getOid()); // TEMP: report what we're doing as we're seeing funny business - log.info("Clearing proxy object [type=" + object.getClass().getName() + - ", remoid=" + origObjectId + ", locoid=" + object.getOid() + "]."); + log.info("Clearing proxy object", "type", object.getClass().getName(), + "remoid", origObjectId, "locoid", object.getOid()); } // from interface DObjectManager @@ -201,8 +201,8 @@ public class PresentsDObjectMgr public void postEvent (DEvent event) { if (!_running) { - log.warning( - "Posting message to inactive object manager", "event", event, new Exception()); + log.warning("Posting message to inactive object manager", "event", event, + new Exception()); } // assign the event's id and append it to the queue @@ -237,7 +237,7 @@ public class PresentsDObjectMgr // insert it into the table _objects.put(oid, object); -// log.info("Registered object [obj=" + object + "]."); +// log.info("Registered object", "obj", object); return object; } @@ -278,8 +278,8 @@ public class PresentsDObjectMgr public void postRunnable (Runnable unit) { if (!_running) { - log.warning( - "Posting runnable to inactive object manager", "unit", unit, new Exception()); + log.warning("Posting runnable to inactive object manager", "unit", unit, + new Exception()); } // just append it to the queue @@ -379,7 +379,7 @@ public class PresentsDObjectMgr { int oid = target.getOid(); -// log.info("Removing destroyed object from table [oid=" + oid + "]."); +// log.info("Removing destroyed object from table", "oid", oid); // remove the object from the table _objects.remove(oid); @@ -433,8 +433,8 @@ public class PresentsDObjectMgr } } catch (Exception e) { - log.warning("Unable to clean up after oid list field [target=" + target + - ", field=" + field + "]."); + log.warning("Unable to clean up after oid list field", "target", target, + "field", field); } } @@ -454,8 +454,8 @@ public class PresentsDObjectMgr // ensure that the target object exists if (!_objects.containsKey(oid)) { - log.info("Rejecting object added event of non-existent object " + - "[refferOid=" + target.getOid() + ", reffedOid=" + oid + "]."); + log.info("Rejecting object added event of non-existent object", + "refferOid", target.getOid(), "reffedOid", oid); return false; } @@ -508,7 +508,7 @@ public class PresentsDObjectMgr int toid = target.getOid(); int oid = ore.getOid(); -// log.info("Processing object removed [from=" + toid + ", roid=" + toid + "]."); +// log.info("Processing object removed", "from", toid, "roid", toid); // get the reference vector for the referenced object Reference[] refs = _refs.get(oid); @@ -517,8 +517,8 @@ public class PresentsDObjectMgr // reference system and then generate object removed events for all of its referencees. // so we opt not to log anything in this case -// log.info("Object removed without reference to track it [toid=" + toid + -// ", field=" + field + ", oid=" + oid + "]."); +// log.info("Object removed without reference to track it", "toid", toid, +// "field", field, "oid", oid); return true; } @@ -532,8 +532,8 @@ public class PresentsDObjectMgr } } - log.warning("Unable to locate reference for removal [reffingOid=" + toid + - ", field=" + field + ", reffedOid=" + oid + "]."); + log.warning("Unable to locate reference for removal", "reffingOid", toid, "field", field, + "reffedOid", oid); return true; } @@ -669,7 +669,7 @@ public class PresentsDObjectMgr // look up the target object DObject target = _objects.get(event.getTargetOid()); if (target == null) { - log.debug("Compound event target no longer exists [event=" + event + "]."); + log.debug("Compound event target no longer exists", "event", event); return; } @@ -677,8 +677,7 @@ public class PresentsDObjectMgr for (int ii = 0; ii < ecount; ii++) { DEvent sevent = events.get(ii); if (!target.checkPermissions(sevent)) { - log.warning("Event failed permissions check [event=" + sevent + - ", target=" + target + "]."); + log.warning("Event failed permissions check", "event", sevent, "target", target); return; } } @@ -700,14 +699,13 @@ public class PresentsDObjectMgr // look up the target object DObject target = _objects.get(event.getTargetOid()); if (target == null) { - log.debug("Event target no longer exists [event=" + event + "]."); + log.debug("Event target no longer exists", "event", event); return; } // check the event's permissions if (!target.checkPermissions(event)) { - log.warning("Event failed permissions check [event=" + event + - ", target=" + target + "]."); + log.warning("Event failed permissions check", "event", event, "target", target); return; } @@ -751,8 +749,7 @@ public class PresentsDObjectMgr handleFatalError(event, e); } catch (Throwable t) { - log.warning("Failure processing event [event=" + event + - ", target=" + target + "].", t); + log.warning("Failure processing event", "event", event, "target", target, t); } // track the number of events dispatched @@ -799,9 +796,8 @@ public class PresentsDObjectMgr // to the referred object which no longer exists; so we don't complain about non- existent // references if the referree is already destroyed if (ref == null && _objects.containsKey(reffedOid)) { - log.warning("Requested to clear out non-existent reference " + - "[refferOid=" + reffer.getOid() + ", field=" + field + - ", reffedOid=" + reffedOid + "]."); + log.warning("Requested to clear out non-existent reference", + "refferOid", reffer.getOid(), "field", field, "reffedOid", reffedOid); // } else { // log.info("Cleared out reference " + ref + "."); @@ -837,7 +833,7 @@ public class PresentsDObjectMgr _helpers.put(ObjectRemovedEvent.class, method); } catch (Exception e) { - log.warning("Unable to register event helpers [error=" + e + "]."); + log.warning("Unable to register event helpers", "error", e); } } @@ -850,8 +846,8 @@ public class PresentsDObjectMgr try { sub.objectAvailable(obj); } catch (Exception e) { - log.warning("Subscriber choked during object available " + - "[obj=" + StringUtil.safeToString(obj) + ", sub=" + sub + "].", e); + log.warning("Subscriber choked during object available", + "obj", StringUtil.safeToString(obj), "sub", sub, e); } } diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java index 1c66782b5..eb4938c24 100644 --- a/src/java/com/threerings/presents/server/PresentsServer.java +++ b/src/java/com/threerings/presents/server/PresentsServer.java @@ -90,7 +90,7 @@ public class PresentsServer String testmod = System.getProperty("test_module"); if (testmod != null) { try { - log.info("Invoking test module [mod=" + testmod + "]."); + log.info("Invoking test module", "mod", testmod); Class tmclass = Class.forName(testmod); Runnable trun = (Runnable)tmclass.newInstance(); trun.run(); @@ -125,15 +125,15 @@ public class PresentsServer { // output general system information SystemInfo si = new SystemInfo(); - log.info("Starting up server [os=" + si.osToString() + ", jvm=" + si.jvmToString() + - ", mem=" + si.memoryToString() + "]."); + log.info("Starting up server", "os", si.osToString(), "jvm", si.jvmToString(), + "mem", si.memoryToString()); // register SIGTERM, SIGINT (ctrl-c) and a SIGHUP handlers boolean registered = false; try { registered = injector.getInstance(SunSignalHandler.class).init(); } catch (Throwable t) { - log.warning("Unable to register Sun signal handlers [error=" + t + "]."); + log.warning("Unable to register Sun signal handlers", "error", t); } if (!registered) { injector.getInstance(NativeSignalHandler.class).init(); diff --git a/src/java/com/threerings/presents/server/PresentsSession.java b/src/java/com/threerings/presents/server/PresentsSession.java index cbd15628d..dd179a684 100644 --- a/src/java/com/threerings/presents/server/PresentsSession.java +++ b/src/java/com/threerings/presents/server/PresentsSession.java @@ -413,8 +413,8 @@ public class PresentsSession // first time through we end our session, subsequently _throttle is null and we just drop // any messages that come in until we've fully shutdown if (_throttle == null) { -// log.info("Dropping message from force-quit client [conn=" + getConnection() + -// ", msg=" + message + "]."); +// log.info("Dropping message from force-quit client", "conn", getConnection(), +// "msg", message); return; } else if (_throttle.throttleOp(message.received)) { @@ -855,8 +855,8 @@ public class PresentsSession // make darned sure we don't have any remaining subscriptions if (_subscrips.size() > 0) { -// log.warning("Clearing stale subscriptions [client=" + this + -// ", subscrips=" + _subscrips.size() + "]."); +// log.warning("Clearing stale subscriptions", "client", this, +// "subscrips", _subscrips.size()); clearSubscrips(_messagesDropped > 10); } return false; @@ -1004,7 +1004,7 @@ public class PresentsSession public void dispatch (PresentsSession client, Message msg) { SubscribeRequest req = (SubscribeRequest)msg; -// log.info("Subscribing [client=" + client + ", oid=" + req.getOid() + "]."); +// log.info("Subscribing", "client", client, "oid", req.getOid()); // forward the subscribe request to the omgr for processing client._omgr.subscribeToObject(req.getOid(), client.createProxySubscriber()); @@ -1020,7 +1020,7 @@ public class PresentsSession { UnsubscribeRequest req = (UnsubscribeRequest)msg; int oid = req.getOid(); -// log.info("Unsubscribing " + client + " [oid=" + oid + "]."); +// log.info("Unsubscribing " + client + "", "oid", oid); // unsubscribe from the object and clear out our proxy client.unmapSubscrip(oid); @@ -1051,7 +1051,7 @@ public class PresentsSession // fill in the proper source oid fevt.setSourceOid(clobj.getOid()); -// log.info("Forwarding event [client=" + client + ", event=" + fevt + "]."); +// log.info("Forwarding event", "client", client, "event", fevt); // forward the event to the omgr for processing client._omgr.postEvent(fevt); diff --git a/src/java/com/threerings/presents/server/RebootManager.java b/src/java/com/threerings/presents/server/RebootManager.java index 8296ff55f..4ed7582b1 100644 --- a/src/java/com/threerings/presents/server/RebootManager.java +++ b/src/java/com/threerings/presents/server/RebootManager.java @@ -298,8 +298,7 @@ public abstract class RebootManager return false; } - log.info("Reboot delayed due to outstanding locks: " + - StringUtil.toString(_rebootLocks.elements())); + log.info("Reboot delayed due to outstanding locks", "locks", _rebootLocks.elements()); broadcast("m.reboot_delayed"); _interval = new Interval(_omgr) { @Override diff --git a/src/java/com/threerings/presents/server/ReportManager.java b/src/java/com/threerings/presents/server/ReportManager.java index d1dd7f517..e25b37d66 100644 --- a/src/java/com/threerings/presents/server/ReportManager.java +++ b/src/java/com/threerings/presents/server/ReportManager.java @@ -135,7 +135,7 @@ public class ReportManager try { rptr.appendReport(report, now, sinceLast, reset); } catch (Throwable t) { - log.warning("Reporter choked [rptr=" + rptr + "].", t); + log.warning("Reporter choked", "rptr", rptr, t); } } diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 8152aa51a..0d2d378bc 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -395,8 +395,7 @@ public class ConnectionManager extends LoopingThread log.info("Server accepting datagrams on " + isa + "."); } catch (IOException ioe) { - log.warning("Failure opening datagram channel on port '" + - port + "'.", ioe); + log.warning("Failure opening datagram channel on port '" + port + "'.", ioe); } } } @@ -550,8 +549,7 @@ public class ConnectionManager extends LoopingThread Set ready = null; int eventCount; try { -// log.debug("Selecting from " + StringUtil.toString(_selector.keys()) + " (" + -// SELECT_LOOP_TIME + ")."); +// log.debug("Selecting from " + _selector.keys() + " (" + SELECT_LOOP_TIME + ")."); // check for incoming network events eventCount = _selector.select(SELECT_LOOP_TIME); @@ -602,7 +600,7 @@ public class ConnectionManager extends LoopingThread continue; } -// log.info("Got event [selkey=" + selkey + ", handler=" + handler + "]."); +// log.info("Got event", "selkey", selkey, "handler", handler); int got = handler.handleEvent(iterStamp); if (got != 0) { @@ -668,8 +666,8 @@ public class ConnectionManager extends LoopingThread if (oqueue != null) { int size = oqueue.size(); if ((size > 500) && (size % 50 == 0)) { - log.warning("Aiya, big overflow queue for " + conn + " [size=" + size + - ", adding=" + tup.right + "]."); + log.warning("Aiya, big overflow queue for " + conn + "", "size", size, + "adding", tup.right); } oqueue.add(tup.right); continue; @@ -717,7 +715,7 @@ public class ConnectionManager extends LoopingThread if (data.length > _outbuf.capacity()) { // increase the buffer size in large increments int ncapacity = Math.max(_outbuf.capacity() << 1, data.length); - log.info("Expanding output buffer size [nsize=" + ncapacity + "]."); + log.info("Expanding output buffer size", "nsize", ncapacity); _outbuf = ByteBuffer.allocateDirect(ncapacity); } @@ -766,7 +764,7 @@ public class ConnectionManager extends LoopingThread { InetSocketAddress target = conn.getDatagramAddress(); if (target == null) { - log.warning("No address to send datagram [conn=" + conn + "]."); + log.warning("No address to send datagram", "conn", conn); return false; } @@ -859,8 +857,7 @@ public class ConnectionManager extends LoopingThread // id, authentication hash, and a class reference) int size = _databuf.flip().remaining(); if (size < 14) { - log.warning("Received undersized datagram [source=" + source + - ", size=" + size + "]."); + log.warning("Received undersized datagram", "source", source, "size", size); return 0; } @@ -870,8 +867,8 @@ public class ConnectionManager extends LoopingThread if (conn != null) { conn.handleDatagram(source, _databuf, when); } else { - log.warning("Received datagram for unknown connection [id=" + connectionId + - ", source=" + source + "]."); + log.warning("Received datagram for unknown connection", "id", connectionId, + "source", source); } // return the size of the datagram @@ -1113,8 +1110,8 @@ public class ConnectionManager extends LoopingThread _partial = null; _partials++; } else { -// log.info("Still going [conn=" + conn + ", wrote=" + wrote + -// ", remain=" + _partial.remaining() + "]."); +// log.info("Still going", "conn", conn, "wrote", wrote, +// "remain", _partial.remaining()); return false; } } diff --git a/src/java/com/threerings/presents/util/ClassUtil.java b/src/java/com/threerings/presents/util/ClassUtil.java index 2322642cc..be5fc67b7 100644 --- a/src/java/com/threerings/presents/util/ClassUtil.java +++ b/src/java/com/threerings/presents/util/ClassUtil.java @@ -81,12 +81,11 @@ public class ClassUtil } catch (NoSuchMethodException nsme) { // nothing to do here but fall through and return null - log.info("No such method [name=" + name + ", tclass=" + tclass.getName() + - ", args=" + StringUtil.toString(args) + ", error=" + nsme + "]."); + log.info("No such method", "name", name, "tclass", tclass.getName(), "args", args, + "error", nsme); } catch (SecurityException se) { - log.warning("Unable to look up method? [tclass=" + tclass.getName() + - ", mname=" + name + "]."); + log.warning("Unable to look up method?", "tclass", tclass.getName(), "mname", name); } return meth; diff --git a/src/java/com/threerings/util/MessageManager.java b/src/java/com/threerings/util/MessageManager.java index 25e19ccfc..b889dad76 100644 --- a/src/java/com/threerings/util/MessageManager.java +++ b/src/java/com/threerings/util/MessageManager.java @@ -161,8 +161,8 @@ public class MessageManager // nothing to worry about } catch (Throwable t) { - log.warning("Failure instantiating custom message bundle " + - "[mbclass=" + mbclass + ", error=" + t + "]."); + log.warning("Failure instantiating custom message bundle", "mbclass", mbclass, + "error", t); } } diff --git a/src/java/com/threerings/util/TrackedObject.java b/src/java/com/threerings/util/TrackedObject.java index 2fb136514..da4aca9fe 100644 --- a/src/java/com/threerings/util/TrackedObject.java +++ b/src/java/com/threerings/util/TrackedObject.java @@ -78,8 +78,7 @@ public class TrackedObject if (count != null) { count[0]--; } else { - log.warning("Finalized TrackedObject missing counter! " + - "[class=" + clazz + "]."); + log.warning("Finalized TrackedObject missing counter!", "class", clazz); } } diff --git a/src/java/com/threerings/util/signal/SignalManager.java b/src/java/com/threerings/util/signal/SignalManager.java index 809294577..f606d72e5 100644 --- a/src/java/com/threerings/util/signal/SignalManager.java +++ b/src/java/com/threerings/util/signal/SignalManager.java @@ -189,8 +189,8 @@ public class SignalManager { ObserverList list = _handlers.get(signal); if (list == null || !list.contains(handler)) { - log.warning("Requested to remove non-registered handler [signal=" + signal + - ", handler=" + handler + "]."); + log.warning("Requested to remove non-registered handler", "signal", signal, + "handler", handler); return; } list.remove(handler);