From 761e05c54005a89fafc9453d8fc6fe2ed78468f5 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 3 Jul 2004 09:30:03 +0000
Subject: [PATCH] Try to only log when something actually bad is going on.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3049 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/server/PresentsClient.java       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java
index 4ee1a5cdf..9e6208384 100644
--- a/src/java/com/threerings/presents/server/PresentsClient.java
+++ b/src/java/com/threerings/presents/server/PresentsClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: PresentsClient.java,v 1.65 2004/03/06 11:29:19 mdb Exp $
+// $Id: PresentsClient.java,v 1.66 2004/07/03 09:30:03 mdb Exp $
 
 package com.threerings.presents.server;
 
@@ -667,8 +667,9 @@ public class PresentsClient
         // 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=" + _conn +
-                     ", msg=" + message + "].");
+//             Log.info("Dropping message from force-quit client " +
+//                      "[conn=" + _conn +
+//                      ", msg=" + message + "].");
             return;
         } else if (_throttle.throttleOp(message.received)) {
             Log.warning("Client sent more than 100 messages in 10 seconds, " +
@@ -730,13 +731,19 @@ public class PresentsClient
             return true;
         }
 
-        Log.info("Dropped message [client=" + this +
-                 ", type=" + msg.getClass().getName() + "].");
+        // don't log dropped messages unless we're dropping a lot of them
+        // (meaning something is still queueing messages up for this dead
+        // client even though it shouldn't be)
+        if (++_messagesDropped % 50 == 0) {
+            Log.warning("Dropping many messages? [client=" + this +
+                        ", count=" + _messagesDropped + "].");
+        }
 
         // make darned sure we don't have any remaining subscriptions
         if (_subscrips.size() > 0) {
-            Log.warning("Clearing stale subscriptions [client=" + this + "].");
-            clearSubscrips(true);
+//             Log.warning("Clearing stale subscriptions [client=" + this +
+//                         ", subscrips=" + _subscrips.size() + "].");
+            clearSubscrips(_messagesDropped > 10);
         }
         return false;
     }
@@ -885,6 +892,7 @@ public class PresentsClient
     // keep these for kicks and giggles
     protected int _messagesIn;
     protected int _messagesOut;
+    protected int _messagesDropped;
 
     /** The amount of time after disconnection a user is allowed before
      * their session is forcibly ended. */