Killed bureau.Log.

We never did things like that in actionscript,
and that pattern is now deprecated on the Java side as well.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5463 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/as/com/threerings/bureau/Log.as

@@ -1,60 +0,0 @@
-//
-// $Id$
-//
-// Narya library - tools for developing networked games
-// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
-// http://www.threerings.net/code/narya/
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published
-// by the Free Software Foundation; either version 2.1 of the License, or
-// (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-package com.threerings.bureau {
-
-import com.threerings.util.Log;
-
-/**
- * Contains a reference to the log object used by the Bureau services.
- */
-public class Log
-{
-    /** We dispatch our log messages through this log. */
-    public static const log :com.threerings.util.Log = 
-        com.threerings.util.Log.getLog(com.threerings.bureau.Log);
-
-    /** Convenience function. */
-    public static function debug (message :String) :void
-    {
-        log.debug(message);
-    }
-
-    /** Convenience function. */
-    public static function info (message :String) :void
-    {
-        log.info(message);
-    }
-
-    /** Convenience function. */
-    public static function warning (message :String) :void
-    {
-        log.warning(message);
-    }
-
-    /** Convenience function. */
-    public static function logStackTrace (e :Error) :void
-    {
-        log.logStackTrace(e);
-    }
-}
-
-}

src/as/com/threerings/bureau/client/BureauDirector.as

@@ -1,18 +1,20 @@
 package com.threerings.bureau.client {
 
+import com.threerings.util.HashMap;
+import com.threerings.util.Log;
+
 import com.threerings.presents.client.BasicDirector;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.bureau.data.BureauCodes;
-import com.threerings.bureau.data.AgentObject;
-import com.threerings.bureau.Log;
-import com.threerings.bureau.util.BureauContext;
 import com.threerings.presents.client.Client;
+import com.threerings.presents.client.ClientEvent;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.dobj.ObjectAccessError;
 import com.threerings.presents.dobj.Subscriber;
 import com.threerings.presents.dobj.SubscriberAdapter;
 import com.threerings.presents.util.SafeSubscriber;
-import com.threerings.presents.dobj.ObjectAccessError;
+
-import com.threerings.util.HashMap;
+import com.threerings.bureau.data.AgentObject;
-import com.threerings.presents.client.ClientEvent;
+import com.threerings.bureau.data.BureauCodes;
+import com.threerings.bureau.util.BureauContext;
 
 /**
  * Allows the server to create and destroy agents on a client.
@@ -44,7 +46,7 @@ public class BureauDirector extends BasicDirector
         var delegator :Subscriber = 
             new SubscriberAdapter(objectAvailable, requestFailed);
 
-        Log.info("Subscribing to object " + agentId);
+        log.info("Subscribing to object", "agentId", agentId);
 
         var subscriber :SafeSubscriber = 
             new SafeSubscriber(agentId, delegator);
@@ -61,19 +63,17 @@ public class BureauDirector extends BasicDirector
         agent = _agents.remove(agentId);
 
         if (agent == null) {
-            Log.warning("Lost an agent, id " + agentId);
+            log.warning("Lost an agent", "id", agentId);
         }
         else {
             try {
                 agent.stop();
-            }
+            } catch (e :Error) {
-            catch (e :Error) {
+                log.warning("Stopping an agent caused an exception", e);
-                Log.warning("Stopping an agent caused an exception");
-                Log.logStackTrace(e);
             }
             var subscriber :SafeSubscriber = _subscribers.remove(agentId);
             if (subscriber == null) {
-                Log.warning("Lost a subscriber for agent " + agent);
+                log.warning("Lost a subscriber for agent", "agent", agent);
             }
             else {
                 subscriber.unsubscribe(_ctx.getDObjectManager());
@@ -89,7 +89,7 @@ public class BureauDirector extends BasicDirector
     {
         var oid :int = agentObject.getOid();
 
-        Log.info("Object " + oid + " now available");
+        log.info("Object available", "oid", oid);
 
         var agent :Agent;
         try {
@@ -98,8 +98,7 @@ public class BureauDirector extends BasicDirector
             agent.start();
         }
         catch (e :Error) {
-            Log.warning("Could not create agent [obj=" + agentObject + "]");
+            log.warning("Could not create agent", "obj", agentObject, e);
-            Log.logStackTrace(e);
             _bureauService.agentCreationFailed(_ctx.getClient(), oid);
             return;
         }
@@ -113,8 +112,7 @@ public class BureauDirector extends BasicDirector
      */
     protected function requestFailed (oid :int, cause :ObjectAccessError) :void
     {
-        Log.warning("Could not subscribe to agent [oid=" + oid + "]");
+        log.warning("Could not subscribe to agent", "oid", oid, cause);
-        Log.logStackTrace(cause);
     }
 
     // from BasicDirector
@@ -154,6 +152,9 @@ public class BureauDirector extends BasicDirector
         throw new Error("Abstract function");
     }
 
+    /** Create a logger for the entire package.. */
+    protected const log :Log = Log.getLog("com.threerings.bureau");
+
     protected var _bureauService :BureauService;
     protected var _agents :HashMap = new HashMap();
     protected var _subscribers :HashMap = new HashMap();