From 7a3f264d436f264df76e46cb052f7198627422ee Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Mon, 3 Nov 2008 23:14:47 +0000
Subject: [PATCH] Minor changes to previous fix. Log runnable, event or message
 that is being posted to the inactive queue. Remove instanceof check since the
 invoker will always be of the expected type

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5495 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/presents/server/PresentsDObjectMgr.java |  6 ++++--
 .../com/threerings/presents/server/PresentsServer.java | 10 ++--------
 .../presents/server/net/ConnectionManager.java         |  3 ++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
index a3b960c66..cfa396ea6 100644
--- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
+++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
@@ -202,7 +202,8 @@ public class PresentsDObjectMgr
     public void postEvent (DEvent event)
     {
         if (!_running) {
-            log.warning("Posting message to inactive object manager", 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
@@ -278,7 +279,8 @@ public class PresentsDObjectMgr
     public void postRunnable (Runnable unit)
     {
         if (!_running) {
-            log.warning("Posting runnable to inactive object manager", new Exception());
+            log.warning(
+                "Posting runnable to inactive object manager", "unit", unit, new Exception());
         }
 
         // just append it to the queue
diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java
index a2f535fe2..1c66782b5 100644
--- a/src/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/java/com/threerings/presents/server/PresentsServer.java
@@ -161,14 +161,8 @@ public class PresentsServer
         
         // Make the client manager shut down before the invoker and dobj threads. This will help
         // application code to avoid long chains of shutdown constraints (e.g. msoy bureau manager).
-        // TODO: is this check needed?
-        if (_invoker instanceof PresentsInvoker) {
-            _shutmgr.addConstraint(
-                _clmgr, ShutdownManager.Constraint.RUNS_BEFORE, (PresentsInvoker)_invoker);
-
-        } else {
-            log.warning("Invoker is not a PresentsInvoker", "invoker", _invoker);
-        }
+        _shutmgr.addConstraint(
+            _clmgr, ShutdownManager.Constraint.RUNS_BEFORE, (PresentsInvoker)_invoker);
     }
 
     /**
diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java
index d0f5ce257..e039f0cb8 100644
--- a/src/java/com/threerings/presents/server/net/ConnectionManager.java
+++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java
@@ -866,7 +866,8 @@ public class ConnectionManager extends LoopingThread
     void postMessage (Connection conn, DownstreamMessage msg)
     {
         if (!isRunning()) {
-            log.warning("Posting message to inactive connection manager", new Exception());
+            log.warning(
+                "Posting message to inactive connection manager", "msg", msg, new Exception());
         }
 
         // sanity check