diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 2bf0e41..458bd4c 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 | |||
37 | /// </summary> | 37 | /// </summary> |
38 | public class MaintenanceThread : iScriptEngineFunctionModule | 38 | public class MaintenanceThread : iScriptEngineFunctionModule |
39 | { | 39 | { |
40 | |||
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
40 | //public ScriptEngine m_ScriptEngine; | 43 | //public ScriptEngine m_ScriptEngine; |
41 | private int MaintenanceLoopms; | 44 | private int MaintenanceLoopms; |
42 | private int MaintenanceLoopTicks_ScriptLoadUnload; | 45 | private int MaintenanceLoopTicks_ScriptLoadUnload; |
@@ -213,11 +216,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
213 | //} | 216 | //} |
214 | } | 217 | } |
215 | } | 218 | } |
219 | catch(System.Threading.ThreadAbortException ex) | ||
220 | { | ||
221 | m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); | ||
222 | } | ||
216 | catch (Exception ex) | 223 | catch (Exception ex) |
217 | { | 224 | { |
218 | if (lastScriptEngine != null) | 225 | m_log.ErrorFormat("Exception in MaintenanceLoopThread. Thread will recover after 5 sec throttle. Exception: {0}", ex.ToString()); |
219 | lastScriptEngine.Log.Error("[" + lastScriptEngine.ScriptEngineName + "]: Exception in MaintenanceLoopThread. Thread will recover after 5 sec throttle. Exception: " + ex.ToString()); | ||
220 | Thread.Sleep(5000); | ||
221 | } | 226 | } |
222 | } | 227 | } |
223 | } | 228 | } |
@@ -231,6 +236,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
231 | // get { return _PleaseShutdown; } | 236 | // get { return _PleaseShutdown; } |
232 | // set { _PleaseShutdown = value; } | 237 | // set { _PleaseShutdown = value; } |
233 | //} | 238 | //} |
234 | //private bool _PleaseShutdown = false; | 239 | //private bool _PleaseShutdown = false; |
235 | } | 240 | } |
236 | } | 241 | } |