OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-22 02:10:27 +01:00
parent 472785a5e8
commit d4cd9e050b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -321,7 +321,7 @@ namespace OpenSim.Framework.Servers
TimeSpan timeTaken = DateTime.Now - m_startuptime; TimeSpan timeTaken = DateTime.Now - m_startuptime;
m_log.InfoFormat( m_log.InfoFormat(
"[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS.", "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.",
timeTaken.Minutes, timeTaken.Seconds); timeTaken.Minutes, timeTaken.Seconds);
} }

16
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -853,7 +853,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
if (m_InitialStartup) if (m_InitialStartup)
{ {
m_InitialStartup = false; // This delay exists to stop mono problems where script compilation and startup would stop the sim
// working properly for the session.
System.Threading.Thread.Sleep(15000); System.Threading.Thread.Sleep(15000);
} }
@ -867,14 +868,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
scriptsStarted++; scriptsStarted++;
// if (scriptsStarted % 50 == 0) if (m_InitialStartup)
// m_log.DebugFormat( if (scriptsStarted % 50 == 0)
// "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); m_log.InfoFormat(
"[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
} }
} }
// m_log.DebugFormat( if (m_InitialStartup)
// "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName); m_log.InfoFormat(
"[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
// NOTE: Despite having a lockless queue, this lock is required // NOTE: Despite having a lockless queue, this lock is required
// to make sure there is never no compile thread while there // to make sure there is never no compile thread while there
@ -888,6 +891,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_ScriptErrorMessage); m_ScriptErrorMessage);
m_ScriptFailCount = 0; m_ScriptFailCount = 0;
m_InitialStartup = false;
return null; return null;
} }

2
bin/OpenSim.exe.config
View File

@ -33,7 +33,7 @@
</root> </root>
<logger name="OpenSim.Region.ScriptEngine.XEngine"> <logger name="OpenSim.Region.ScriptEngine.XEngine">
<level value="WARN"/> <level value="INFO"/>
</logger> </logger>
</log4net> </log4net>