From d7d2de3a08141a2a445119b5b26b7f766b2be44c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 10 Jul 2009 18:57:16 +0000 Subject: [PATCH] * minor: standardize some logging messages --- .../Communications/Services/GridInfoService.cs | 17 ++++++++++------- .../Communications/OGS1/OGS1GridServices.cs | 3 +-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs index 70e7dce8dc..cd2a152918 100644 --- a/OpenSim/Framework/Communications/Services/GridInfoService.cs +++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs @@ -72,7 +72,8 @@ namespace OpenSim.Framework.Communications.Services } 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) { - _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() { - _log.Warn("[GridInfoService] 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]: found no [GridInfo] section in your OpenSim.ini"); + _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); + 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(); 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) { diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 9ba84a7038..b24df6f60b 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -97,11 +97,10 @@ namespace OpenSim.Region.Communications.OGS1 { 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")); throw e; - } m_regionsOnInstance.Add(regionInfo);