diff options
author | John Hurliman | 2010-03-26 15:13:55 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-26 15:13:55 -0700 |
commit | 1430441cf32c659502c6ed1bd7fd54e55a107c05 (patch) | |
tree | 23e3e318fc2b043e1f5ec9c8dc3dee436b8fbfa1 /OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-1430441cf32c659502c6ed1bd7fd54e55a107c05.zip opensim-SC-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.gz opensim-SC-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.bz2 opensim-SC-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.xz |
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 071a481..3a61226 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -85,14 +85,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
85 | IConfig gridConfig = source.Configs["GridService"]; | 85 | IConfig gridConfig = source.Configs["GridService"]; |
86 | if (gridConfig == null) | 86 | if (gridConfig == null) |
87 | { | 87 | { |
88 | m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini"); | 88 | m_log.Error("[SIMIAN GRID CONNECTOR]: GridService missing from OpenSim.ini"); |
89 | throw new Exception("Grid connector init error"); | 89 | throw new Exception("Grid connector init error"); |
90 | } | 90 | } |
91 | 91 | ||
92 | string serviceUrl = gridConfig.GetString("GridServerURI"); | 92 | string serviceUrl = gridConfig.GetString("GridServerURI"); |
93 | if (String.IsNullOrEmpty(serviceUrl)) | 93 | if (String.IsNullOrEmpty(serviceUrl)) |
94 | { | 94 | { |
95 | m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService"); | 95 | m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); |
96 | throw new Exception("Grid connector init error"); | 96 | throw new Exception("Grid connector init error"); |
97 | } | 97 | } |
98 | 98 | ||
@@ -155,7 +155,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
155 | bool success = response["Success"].AsBoolean(); | 155 | bool success = response["Success"].AsBoolean(); |
156 | 156 | ||
157 | if (!success) | 157 | if (!success) |
158 | m_log.Warn("[GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); | 158 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); |
159 | 159 | ||
160 | return success; | 160 | return success; |
161 | } | 161 | } |
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | m_log.Debug("[GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); | 184 | m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); |
185 | return regions; | 185 | return regions; |
186 | } | 186 | } |
187 | 187 | ||
@@ -203,7 +203,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
203 | } | 203 | } |
204 | else | 204 | else |
205 | { | 205 | { |
206 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID); | 206 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID); |
207 | return null; | 207 | return null; |
208 | } | 208 | } |
209 | } | 209 | } |
@@ -228,7 +228,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
228 | } | 228 | } |
229 | else | 229 | else |
230 | { | 230 | { |
231 | //m_log.InfoFormat("[GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", | 231 | //m_log.InfoFormat("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", |
232 | // x / Constants.RegionSize, y / Constants.RegionSize); | 232 | // x / Constants.RegionSize, y / Constants.RegionSize); |
233 | return null; | 233 | return null; |
234 | } | 234 | } |
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
238 | { | 238 | { |
239 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); | 239 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); |
240 | 240 | ||
241 | m_log.Debug("[GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); | 241 | m_log.Debug("[SIMIAN GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); |
242 | 242 | ||
243 | if (regions.Count > 0) | 243 | if (regions.Count > 0) |
244 | return regions[0]; | 244 | return regions[0]; |
@@ -349,7 +349,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
349 | } | 349 | } |
350 | else | 350 | else |
351 | { | 351 | { |
352 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); | 352 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); |
353 | return -1; | 353 | return -1; |
354 | } | 354 | } |
355 | } | 355 | } |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
374 | } | 374 | } |
375 | else | 375 | else |
376 | { | 376 | { |
377 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region at " + position); | 377 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at " + position); |
378 | return null; | 378 | return null; |
379 | } | 379 | } |
380 | } | 380 | } |