aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-12-14 01:34:28 +0000
committerJustin Clark-Casey (justincc)2013-12-14 01:34:28 +0000
commit996a6c2eeacf25456d2ffc12e59c34240cf8a578 (patch)
tree0b9e075e4e5a2e7781152d2f80e3cd87b011bf51
parentConvert if-blocks to return statements in small functions such as GetStartPar... (diff)
downloadopensim-SC_OLD-996a6c2eeacf25456d2ffc12e59c34240cf8a578.zip
opensim-SC_OLD-996a6c2eeacf25456d2ffc12e59c34240cf8a578.tar.gz
opensim-SC_OLD-996a6c2eeacf25456d2ffc12e59c34240cf8a578.tar.bz2
opensim-SC_OLD-996a6c2eeacf25456d2ffc12e59c34240cf8a578.tar.xz
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs8
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4ab6908..566772d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers
135 135
136 TimeSpan timeTaken = DateTime.Now - m_startuptime; 136 TimeSpan timeTaken = DateTime.Now - m_startuptime;
137 137
138 m_log.InfoFormat( 138 MainConsole.Instance.OutputFormat(
139 "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", 139 "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.",
140 timeTaken.Minutes, timeTaken.Seconds); 140 timeTaken.Minutes, timeTaken.Seconds);
141 } 141 }
142 142
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c717128..eb386fe 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -216,9 +216,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
216 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", 216 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}",
217 // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); 217 // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
218 218
219 // Warn level because the region cannot be used while logins are disabled 219 // Putting this out to console to make it eye-catching for people who are running OpenSimulator
220 m_log.WarnFormat( 220 // without info log messages enabled. Making this a warning is arguably misleading since it isn't a
221 "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); 221 // warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
222 // Arguably, log4net needs a status log level (like Apache).
223 MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
222 } 224 }
223 225
224 m_scene.SceneGridService.InformNeighborsThatRegionisUp( 226 m_scene.SceneGridService.InformNeighborsThatRegionisUp(