From ebdf693143782dce350113d64eadf9315a490e5b Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 21 Feb 2004 02:18:56 +0000 Subject: [PATCH] Log the culprit when we report and continue from a fatal error. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2963 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/server/PresentsDObjectMgr.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 90c9ec751..2f332fb92 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -1,5 +1,5 @@ // -// $Id: PresentsDObjectMgr.java,v 1.41 2004/02/21 00:22:30 mdb Exp $ +// $Id: PresentsDObjectMgr.java,v 1.42 2004/02/21 02:18:56 mdb Exp $ package com.threerings.presents.server; @@ -189,9 +189,9 @@ public class PresentsDObjectMgr Log.warning("Execution unit failed [unit=" + unit + "]."); Log.logStackTrace(e); } catch (OutOfMemoryError oome) { - handleFatalError(oome); + handleFatalError(unit, oome); } catch (StackOverflowError soe) { - handleFatalError(soe); + handleFatalError(unit, soe); } } else if (unit instanceof CompoundEvent) { @@ -328,10 +328,10 @@ public class PresentsDObjectMgr Log.logStackTrace(e); } catch (OutOfMemoryError oome) { - handleFatalError(oome); + handleFatalError(event, oome); } catch (StackOverflowError soe) { - handleFatalError(soe); + handleFatalError(event, soe); } // track the number of events dispatched @@ -343,11 +343,12 @@ public class PresentsDObjectMgr * Attempts to recover from fatal errors but rethrows if things are * freaking out too frequently. */ - protected void handleFatalError (Error error) + protected void handleFatalError (Object causer, Error error) { if (_fatalThrottle.throttleOp()) { throw error; } + Log.warning("Fatal error caused by '" + causer + "': " + error); Log.logStackTrace(error); }