From a63af7933ebbc0c6f806de446e3badf04fcc3bf1 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 25 Jun 2006 23:31:21 +0000
Subject: [PATCH] Make it possible to generate a non-resetting report
 externally.

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

diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java
index 96868460a..275b9d78d 100644
--- a/src/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/java/com/threerings/presents/server/PresentsServer.java
@@ -205,7 +205,7 @@ public class PresentsServer
 
         case SignalManager.SIGUSR1:
             // generate a system status report
-            Log.info(generateReport(System.currentTimeMillis(), false));
+            Log.info(generateReport());
             break;
 
         default:
@@ -226,10 +226,19 @@ public class PresentsServer
         _reporters.add(reporter);
     }
 
+    /**
+     * Generates a report for all system services registered as a {@link
+     * Reporter}.
+     */
+    public static String generateReport ()
+    {
+        return generateReport(System.currentTimeMillis(), false);
+    }
+
     /**
      * Generates and logs a "state of server" report.
      */
-    protected String generateReport (long now, boolean reset)
+    protected static String generateReport (long now, boolean reset)
     {
         long sinceLast = now - _lastReportStamp;
         long uptime = now - _serverStartTime;
@@ -384,10 +393,10 @@ public class PresentsServer
     }
 
     /** The time at which the server was started. */
-    protected long _serverStartTime = System.currentTimeMillis();
+    protected static long _serverStartTime = System.currentTimeMillis();
 
     /** The last time at which {@link #generateReport} was run. */
-    protected long _lastReportStamp = _serverStartTime;
+    protected static long _lastReportStamp = _serverStartTime;
 
     /** Used to generate "state of server" reports. */
     protected static ArrayList _reporters = new ArrayList();