diff options
author | Justin Clark-Casey (justincc) | 2013-01-23 23:34:15 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-23 23:34:15 +0000 |
commit | 72dd3633eeb74c64620ffedb1618e732cbbca641 (patch) | |
tree | 4c2c544bdbc31b57003a60ed4a2b1beeaa320db8 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then cont... (diff) | |
download | opensim-SC_OLD-72dd3633eeb74c64620ffedb1618e732cbbca641.zip opensim-SC_OLD-72dd3633eeb74c64620ffedb1618e732cbbca641.tar.gz opensim-SC_OLD-72dd3633eeb74c64620ffedb1618e732cbbca641.tar.bz2 opensim-SC_OLD-72dd3633eeb74c64620ffedb1618e732cbbca641.tar.xz |
Improve logging by making it clearer which script is failing if an assembly fails to load.
Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1
Logs which stop strategy is being used (abort or co-op)
Adjusts some other logging to remove not very useful stuff
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 604924b..ad79a9b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -241,7 +241,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
241 | m_ScriptConfig = configSource.Configs["XEngine"]; | 241 | m_ScriptConfig = configSource.Configs["XEngine"]; |
242 | m_ConfigSource = configSource; | 242 | m_ConfigSource = configSource; |
243 | 243 | ||
244 | if (m_ScriptConfig.GetString("ScriptStopStrategy", "abort") == "co-op") | 244 | string rawScriptStopStrategy = m_ScriptConfig.GetString("ScriptStopStrategy", "abort"); |
245 | |||
246 | m_log.InfoFormat("[XEngine]: Script stop strategy is {0}", rawScriptStopStrategy); | ||
247 | |||
248 | if (rawScriptStopStrategy == "co-op") | ||
245 | { | 249 | { |
246 | ScriptClassName = "XEngineScript"; | 250 | ScriptClassName = "XEngineScript"; |
247 | ScriptBaseClassName = typeof(XEngineScriptBase).FullName; | 251 | ScriptBaseClassName = typeof(XEngineScriptBase).FullName; |
@@ -261,15 +265,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
261 | { | 265 | { |
262 | if (m_ScriptConfig == null) | 266 | if (m_ScriptConfig == null) |
263 | return; | 267 | return; |
268 | |||
264 | m_ScriptFailCount = 0; | 269 | m_ScriptFailCount = 0; |
265 | m_ScriptErrorMessage = String.Empty; | 270 | m_ScriptErrorMessage = String.Empty; |
266 | 271 | ||
267 | if (m_ScriptConfig == null) | ||
268 | { | ||
269 | // m_log.ErrorFormat("[XEngine] No script configuration found. Scripts disabled"); | ||
270 | return; | ||
271 | } | ||
272 | |||
273 | m_Enabled = m_ScriptConfig.GetBoolean("Enabled", true); | 272 | m_Enabled = m_ScriptConfig.GetBoolean("Enabled", true); |
274 | 273 | ||
275 | if (!m_Enabled) | 274 | if (!m_Enabled) |