From 8aeb239f64e50bf447c32e81562e422a5ea28f15 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 26 Oct 2008 20:12:03 +0000 Subject: [PATCH] Only put our header on logged reports, not reports generated by explicit callers. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5466 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/server/ReportManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/server/ReportManager.java b/src/java/com/threerings/presents/server/ReportManager.java index 1012e7bbd..c3516b8eb 100644 --- a/src/java/com/threerings/presents/server/ReportManager.java +++ b/src/java/com/threerings/presents/server/ReportManager.java @@ -65,7 +65,7 @@ public class ReportManager _reportInterval = new Interval(rqueue) { @Override public void expired () { - logReport(generateReport(System.currentTimeMillis(), true)); + logReport(LOG_REPORT_HEADER + generateReport(System.currentTimeMillis(), true)); } }; _reportInterval.schedule(REPORT_INTERVAL, true); @@ -95,7 +95,7 @@ public class ReportManager { long sinceLast = now - _lastReportStamp; long uptime = now - _serverStartTime; - StringBuilder report = new StringBuilder("State of server report:\n"); + StringBuilder report = new StringBuilder(); report.append("- Uptime: "); report.append(StringUtil.intervalToString(uptime)).append("\n"); @@ -166,4 +166,7 @@ public class ReportManager /** The frequency with which we generate "state of server" reports. */ protected static final long REPORT_INTERVAL = 15 * 60 * 1000L; + + /** The header to prefix to our logged reports. */ + protected static final String LOG_REPORT_HEADER = "State of server report:\n"; }