diff options
author | Justin Clark-Casey (justincc) | 2012-06-22 02:10:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-22 02:10:27 +0100 |
commit | 9f3feeff8d3a00b965b2151477df5b0b2de3ff1d (patch) | |
tree | d80a2ef89727188a8aa41ae79da270ebd52ed8f5 | |
parent | Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in XEngine... (diff) | |
download | opensim-SC-9f3feeff8d3a00b965b2151477df5b0b2de3ff1d.zip opensim-SC-9f3feeff8d3a00b965b2151477df5b0b2de3ff1d.tar.gz opensim-SC-9f3feeff8d3a00b965b2151477df5b0b2de3ff1d.tar.bz2 opensim-SC-9f3feeff8d3a00b965b2151477df5b0b2de3ff1d.tar.xz |
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 16 | ||||
-rwxr-xr-x | bin/OpenSim.exe.config | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 62ea9e3..9459f76 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Servers | |||
321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
322 | 322 | ||
323 | m_log.InfoFormat( | 323 | m_log.InfoFormat( |
324 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS.", | 324 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", |
325 | timeTaken.Minutes, timeTaken.Seconds); | 325 | timeTaken.Minutes, timeTaken.Seconds); |
326 | } | 326 | } |
327 | 327 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 26df758..40f48e3 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -853,7 +853,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
853 | { | 853 | { |
854 | if (m_InitialStartup) | 854 | if (m_InitialStartup) |
855 | { | 855 | { |
856 | m_InitialStartup = false; | 856 | // This delay exists to stop mono problems where script compilation and startup would stop the sim |
857 | // working properly for the session. | ||
857 | System.Threading.Thread.Sleep(15000); | 858 | System.Threading.Thread.Sleep(15000); |
858 | } | 859 | } |
859 | 860 | ||
@@ -867,14 +868,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
867 | { | 868 | { |
868 | scriptsStarted++; | 869 | scriptsStarted++; |
869 | 870 | ||
870 | // if (scriptsStarted % 50 == 0) | 871 | if (m_InitialStartup) |
871 | // m_log.DebugFormat( | 872 | if (scriptsStarted % 50 == 0) |
872 | // "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 873 | m_log.InfoFormat( |
874 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | ||
873 | } | 875 | } |
874 | } | 876 | } |
875 | 877 | ||
876 | // m_log.DebugFormat( | 878 | if (m_InitialStartup) |
877 | // "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | 879 | m_log.InfoFormat( |
880 | "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); | ||
878 | 881 | ||
879 | // NOTE: Despite having a lockless queue, this lock is required | 882 | // NOTE: Despite having a lockless queue, this lock is required |
880 | // to make sure there is never no compile thread while there | 883 | // to make sure there is never no compile thread while there |
@@ -888,6 +891,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
888 | m_ScriptErrorMessage); | 891 | m_ScriptErrorMessage); |
889 | 892 | ||
890 | m_ScriptFailCount = 0; | 893 | m_ScriptFailCount = 0; |
894 | m_InitialStartup = false; | ||
891 | 895 | ||
892 | return null; | 896 | return null; |
893 | } | 897 | } |
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index f1e3709..e3107ab 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -33,7 +33,7 @@ | |||
33 | </root> | 33 | </root> |
34 | 34 | ||
35 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> | 35 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> |
36 | <level value="WARN"/> | 36 | <level value="INFO"/> |
37 | </logger> | 37 | </logger> |
38 | 38 | ||
39 | </log4net> | 39 | </log4net> |