From 408cf8aa6e89397c46b3b0a250ad9e0ce9f41382 Mon Sep 17 00:00:00 2001 From: "Ray J. Greenwell" Date: Sat, 26 Oct 2013 18:25:45 -0700 Subject: [PATCH] Remove 'TEMP' logging from 2008-2009. The proxy stuff shows up all the time in the px logs. --- .../threerings/presents/server/PresentsDObjectMgr.java | 6 ------ .../com/threerings/presents/server/PresentsSession.java | 6 ------ .../presents/server/net/ServerCommunicator.java | 9 --------- 3 files changed, 21 deletions(-) diff --git a/core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java b/core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java index ede31d9c2..d2aaf12b1 100644 --- a/core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -176,9 +176,6 @@ public class PresentsDObjectMgr // and note a proxy reference for the object which we'll use to forward events back to its // 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()); } /** @@ -192,9 +189,6 @@ public class PresentsDObjectMgr 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()); } // from interface DObjectManager diff --git a/core/src/main/java/com/threerings/presents/server/PresentsSession.java b/core/src/main/java/com/threerings/presents/server/PresentsSession.java index 5bc5bc923..e8c722790 100644 --- a/core/src/main/java/com/threerings/presents/server/PresentsSession.java +++ b/core/src/main/java/com/threerings/presents/server/PresentsSession.java @@ -1243,9 +1243,6 @@ public class PresentsSession { // send a pong response using the transport with which the message was received PingRequest req = (PingRequest)msg; - if (PING_DEBUG) { - log.info("Got ping, ponging", "client", client.getAuthName()); - } client.safePostMessage(new PongResponse(req.getUnpackStamp(), req.getTransport()), client.getConnection()); } @@ -1345,9 +1342,6 @@ public class PresentsSession /** Default period a user is allowed after disconn before their session is forcibly ended. */ protected static final long DEFAULT_FLUSH_TIME = 7 * 60 * 1000L; - // TEMP - protected static final boolean PING_DEBUG = Boolean.getBoolean("ping_debug"); - // register our message dispatchers static { _disps.put(SubscribeRequest.class, new SubscribeDispatcher()); diff --git a/core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java b/core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java index 2f827cfc7..ad7ff9a13 100644 --- a/core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java +++ b/core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java @@ -72,9 +72,6 @@ public class ServerCommunicator extends Communicator // outgoing traffic on this connection is used to prevent idleness // TODO: shouldn't PongResponse handle this? _lastEvent = System.currentTimeMillis(); - if (PING_DEBUG && msg instanceof PingRequest) { // TEMP - log.info("Pinging on server comm " + msg); - } } @Override public void connectFailure (IOException ioe) { @@ -187,9 +184,6 @@ public class ServerCommunicator extends Communicator // now we can route all messages to the ClientDObjectMgr _conn.setMessageHandler(new PresentsConnection.MessageHandler() { public void handleMessage (Message message) { - if (PING_DEBUG && message instanceof PongResponse) { - log.info("Got pong from server " + message); - } processMessage(message); } }); @@ -213,7 +207,4 @@ public class ServerCommunicator extends Communicator protected PresentsConnection _conn; protected ClassLoader _loader; protected Exception _logonError; - - // TEMP - protected static final boolean PING_DEBUG = Boolean.getBoolean("ping_debug"); }