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

* minor: standardize some logging messages

trunk
Justin Clarke Casey 2009-07-10 18:57:16 +00:00
parent 148e2d55fa
commit d7d2de3a08
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Communications/Services/GridInfoService.cs
View File

@ -72,7 +72,8 @@ namespace OpenSim.Framework.Communications.Services
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
_log.Warn("[GridInfoService] no OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users"); _log.Warn(
"[GRID INFO SERVICE]: No OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users");
} }
} }
@ -123,19 +124,21 @@ namespace OpenSim.Framework.Communications.Services
} }
catch (Exception) catch (Exception)
{ {
_log.Debug("[GridInfoService] cannot get grid info from config source, using minimal defaults"); _log.Debug("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults");
} }
_log.InfoFormat("[GridInfoService] Grid info service initialized with {0} keys", _info.Count);
_log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count);
} }
private void IssueWarning() private void IssueWarning()
{ {
_log.Warn("[GridInfoService] found no [GridInfo] section in your OpenSim.ini"); _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your OpenSim.ini");
_log.Warn("[GridInfoService] trying to guess sensible defaults, you might want to provide better ones:"); _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:");
foreach (string k in _info.Keys) foreach (string k in _info.Keys)
{ {
_log.WarnFormat("[GridInfoService] {0}: {1}", k, _info[k]); _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]);
} }
} }
@ -144,7 +147,7 @@ namespace OpenSim.Framework.Communications.Services
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable(); Hashtable responseData = new Hashtable();
_log.Info("[GridInfo]: Request for grid info"); _log.Info("[GRID INFO SERVICE]: Request for grid info");
foreach (string k in _info.Keys) foreach (string k in _info.Keys)
{ {

3
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -97,11 +97,10 @@ namespace OpenSim.Region.Communications.OGS1
{ {
if (m_regionsOnInstance.Contains(regionInfo)) if (m_regionsOnInstance.Contains(regionInfo))
{ {
m_log.Debug("[OGS1 GRID SERVICES] Foobar! Caller is confused, region already registered " + regionInfo.RegionName); m_log.Error("[OGS1 GRID SERVICES]: Foobar! Caller is confused, region already registered " + regionInfo.RegionName);
Exception e = new Exception(String.Format("Unable to register region")); Exception e = new Exception(String.Format("Unable to register region"));
throw e; throw e;
} }
m_regionsOnInstance.Add(regionInfo); m_regionsOnInstance.Add(regionInfo);