From 3ddbf28cd06915dddc38b89715562ef6ed25f932 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 28 Apr 2008 14:50:09 +0000 Subject: [PATCH] wrap a common exception that we get on shutdown of the script engine to keep people from thinking it's a real issue. --- .../Common/ScriptEngineBase/MaintenanceThread.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 2bf0e41714..458bd4cb0f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -37,6 +37,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// public class MaintenanceThread : iScriptEngineFunctionModule { + + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + //public ScriptEngine m_ScriptEngine; private int MaintenanceLoopms; private int MaintenanceLoopTicks_ScriptLoadUnload; @@ -213,11 +216,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase //} } } + catch(System.Threading.ThreadAbortException ex) + { + m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); + } catch (Exception ex) { - if (lastScriptEngine != null) - lastScriptEngine.Log.Error("[" + lastScriptEngine.ScriptEngineName + "]: Exception in MaintenanceLoopThread. Thread will recover after 5 sec throttle. Exception: " + ex.ToString()); - Thread.Sleep(5000); + m_log.ErrorFormat("Exception in MaintenanceLoopThread. Thread will recover after 5 sec throttle. Exception: {0}", ex.ToString()); } } } @@ -231,6 +236,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // get { return _PleaseShutdown; } // set { _PleaseShutdown = value; } //} - //private bool _PleaseShutdown = false; + //private bool _PleaseShutdown = false; } }