diff options
-rw-r--r-- | OpenSim/Framework/Communications/Services/GridInfoService.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/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 70e7dce..cd2a152 100644 --- a/OpenSim/Framework/Communications/Services/GridInfoService.cs +++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs | |||
@@ -72,7 +72,8 @@ namespace OpenSim.Framework.Communications.Services | |||
72 | } | 72 | } |
73 | catch (FileNotFoundException) | 73 | catch (FileNotFoundException) |
74 | { | 74 | { |
75 | _log.Warn("[GridInfoService] no OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users"); | 75 | _log.Warn( |
76 | "[GRID INFO SERVICE]: No OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users"); | ||
76 | } | 77 | } |
77 | } | 78 | } |
78 | 79 | ||
@@ -123,19 +124,21 @@ namespace OpenSim.Framework.Communications.Services | |||
123 | } | 124 | } |
124 | catch (Exception) | 125 | catch (Exception) |
125 | { | 126 | { |
126 | _log.Debug("[GridInfoService] cannot get grid info from config source, using minimal defaults"); | 127 | _log.Debug("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults"); |
127 | } | 128 | } |
128 | _log.InfoFormat("[GridInfoService] Grid info service initialized with {0} keys", _info.Count); | 129 | |
130 | _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count); | ||
129 | 131 | ||
130 | } | 132 | } |
131 | 133 | ||
132 | private void IssueWarning() | 134 | private void IssueWarning() |
133 | { | 135 | { |
134 | _log.Warn("[GridInfoService] found no [GridInfo] section in your OpenSim.ini"); | 136 | _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your OpenSim.ini"); |
135 | _log.Warn("[GridInfoService] trying to guess sensible defaults, you might want to provide better ones:"); | 137 | _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); |
138 | |||
136 | foreach (string k in _info.Keys) | 139 | foreach (string k in _info.Keys) |
137 | { | 140 | { |
138 | _log.WarnFormat("[GridInfoService] {0}: {1}", k, _info[k]); | 141 | _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]); |
139 | } | 142 | } |
140 | } | 143 | } |
141 | 144 | ||
@@ -144,7 +147,7 @@ namespace OpenSim.Framework.Communications.Services | |||
144 | XmlRpcResponse response = new XmlRpcResponse(); | 147 | XmlRpcResponse response = new XmlRpcResponse(); |
145 | Hashtable responseData = new Hashtable(); | 148 | Hashtable responseData = new Hashtable(); |
146 | 149 | ||
147 | _log.Info("[GridInfo]: Request for grid info"); | 150 | _log.Info("[GRID INFO SERVICE]: Request for grid info"); |
148 | 151 | ||
149 | foreach (string k in _info.Keys) | 152 | foreach (string k in _info.Keys) |
150 | { | 153 | { |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 9ba84a7..b24df6f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -97,11 +97,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
97 | { | 97 | { |
98 | if (m_regionsOnInstance.Contains(regionInfo)) | 98 | if (m_regionsOnInstance.Contains(regionInfo)) |
99 | { | 99 | { |
100 | m_log.Debug("[OGS1 GRID SERVICES] Foobar! Caller is confused, region already registered " + regionInfo.RegionName); | 100 | m_log.Error("[OGS1 GRID SERVICES]: Foobar! Caller is confused, region already registered " + regionInfo.RegionName); |
101 | Exception e = new Exception(String.Format("Unable to register region")); | 101 | Exception e = new Exception(String.Format("Unable to register region")); |
102 | 102 | ||
103 | throw e; | 103 | throw e; |
104 | |||
105 | } | 104 | } |
106 | 105 | ||
107 | m_regionsOnInstance.Add(regionInfo); | 106 | m_regionsOnInstance.Add(regionInfo); |