diff options
author | Justin Clark-Casey (justincc) | 2013-05-30 23:51:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-30 23:51:35 +0100 |
commit | 46335b103e1f993c6aa77e46f89e5ee0d6d7497e (patch) | |
tree | 9e614503036b3f158221ba560b05623b2f6ba0ba | |
parent | minor: fix warnings in GodsModule that were due to duplicate using statements (diff) | |
download | opensim-SC_OLD-46335b103e1f993c6aa77e46f89e5ee0d6d7497e.zip opensim-SC_OLD-46335b103e1f993c6aa77e46f89e5ee0d6d7497e.tar.gz opensim-SC_OLD-46335b103e1f993c6aa77e46f89e5ee0d6d7497e.tar.bz2 opensim-SC_OLD-46335b103e1f993c6aa77e46f89e5ee0d6d7497e.tar.xz |
If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 1c59624..352e316 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
47 | /// </summary> | 47 | /// </summary> |
48 | public class AsyncCommandManager | 48 | public class AsyncCommandManager |
49 | { | 49 | { |
50 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | private static Thread cmdHandlerThread; | 52 | private static Thread cmdHandlerThread; |
53 | private static int cmdHandlerThreadCycleSleepms; | 53 | private static int cmdHandlerThreadCycleSleepms; |
@@ -183,17 +183,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
183 | { | 183 | { |
184 | try | 184 | try |
185 | { | 185 | { |
186 | while (true) | 186 | Thread.Sleep(cmdHandlerThreadCycleSleepms); |
187 | { | ||
188 | Thread.Sleep(cmdHandlerThreadCycleSleepms); | ||
189 | 187 | ||
190 | DoOneCmdHandlerPass(); | 188 | DoOneCmdHandlerPass(); |
191 | 189 | ||
192 | Watchdog.UpdateThread(); | 190 | Watchdog.UpdateThread(); |
193 | } | ||
194 | } | 191 | } |
195 | catch | 192 | catch (Exception e) |
196 | { | 193 | { |
194 | m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e); | ||
197 | } | 195 | } |
198 | } | 196 | } |
199 | } | 197 | } |