From 820675318836861c94c40d855e97c634601eeaf0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 23 May 2007 18:40:15 +0000
Subject: [PATCH] A we bit of (not so) new logging world order conversion.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4718 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/server/PresentsServer.java       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java
index ec241c271..49dc6af60 100644
--- a/src/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/java/com/threerings/presents/server/PresentsServer.java
@@ -22,17 +22,19 @@
 package com.threerings.presents.server;
 
 import java.util.ArrayList;
+import java.util.logging.Level;
 
 import com.samskivert.util.Interval;
 import com.samskivert.util.ObserverList;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.SystemInfo;
 
-import com.threerings.presents.Log;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.dobj.AccessController;
 import com.threerings.presents.server.net.ConnectionManager;
 
+import static com.threerings.presents.Log.log;
+
 /**
  * The presents server provides a central point of access to the various facilities that make up
  * the presents framework. To facilitate extension and customization, a single instance of the
@@ -92,7 +94,7 @@ public class PresentsServer
     {
         // output general system information
         SystemInfo si = new SystemInfo();
-        Log.info("Starting up server [os=" + si.osToString() + ", jvm=" + si.jvmToString() +
+        log.info("Starting up server [os=" + si.osToString() + ", jvm=" + si.jvmToString() +
                  ", mem=" + si.memoryToString() + "].");
 
         // register SIGINT (ctrl-c) and a SIGHUP handlers
@@ -242,8 +244,7 @@ public class PresentsServer
             try {
                 rptr.appendReport(report, now, sinceLast, reset);
             } catch (Throwable t) {
-                Log.warning("Reporter choked [rptr=" + rptr + "].");
-                Log.logStackTrace(t);
+                log.log(Level.WARNING, "Reporter choked [rptr=" + rptr + "].", t);
             }
         }
 
@@ -277,7 +278,7 @@ public class PresentsServer
      */
     protected void logReport (String report)
     {
-        Log.info(report);
+        log.info(report);
     }
 
     /**
@@ -288,7 +289,7 @@ public class PresentsServer
     {
         ObserverList<Shutdowner> downers = _downers;
         if (downers == null) {
-            Log.warning("Refusing repeat shutdown request.");
+            log.warning("Refusing repeat shutdown request.");
             return;
         }
         _downers = null;
@@ -343,7 +344,7 @@ public class PresentsServer
 
     public static void main (String[] args)
     {
-        Log.info("Presents server starting...");
+        log.info("Presents server starting...");
 
         PresentsServer server = new PresentsServer();
         try {
@@ -354,14 +355,12 @@ 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();
                 } catch (Exception e) {
-                    Log.warning("Unable to invoke test module " +
-                                "[mod=" + testmod + "].");
-                    Log.logStackTrace(e);
+                    log.log(Level.WARNING, "Unable to invoke test module '" + testmod + "'.", e);
                 }
             }
 
@@ -370,8 +369,7 @@ public class PresentsServer
             server.run();
 
         } catch (Exception e) {
-            Log.warning("Unable to initialize server.");
-            Log.logStackTrace(e);
+            log.log(Level.WARNING, "Unable to initialize server.", e);
             System.exit(-1);
         }
     }