diff options
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 3ee7aef..f4a8475 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Grid.GridServer | |||
112 | } | 112 | } |
113 | catch (Exception) | 113 | catch (Exception) |
114 | { | 114 | { |
115 | MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); | 115 | MainLog.Instance.Warn("storage", "Unable to write log via " + kvp.Key); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | } | 118 | } |
@@ -131,7 +131,7 @@ namespace OpenSim.Grid.GridServer | |||
131 | } | 131 | } |
132 | catch (Exception e) | 132 | catch (Exception e) |
133 | { | 133 | { |
134 | MainLog.Instance.Warn("Message from Storage: " + e.Message); | 134 | MainLog.Instance.Warn("storage", "getRegion - " + e.Message); |
135 | } | 135 | } |
136 | } | 136 | } |
137 | return null; | 137 | return null; |
@@ -152,7 +152,7 @@ namespace OpenSim.Grid.GridServer | |||
152 | } | 152 | } |
153 | catch | 153 | catch |
154 | { | 154 | { |
155 | MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); | 155 | MainLog.Instance.Warn("storage", "Unable to find region " + handle.ToString() + " via " + kvp.Key); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | return null; | 158 | return null; |
@@ -176,7 +176,7 @@ namespace OpenSim.Grid.GridServer | |||
176 | } | 176 | } |
177 | catch | 177 | catch |
178 | { | 178 | { |
179 | MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); | 179 | MainLog.Instance.Warn("storage", "Unable to query regionblock via " + kvp.Key); |
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
@@ -288,24 +288,24 @@ namespace OpenSim.Grid.GridServer | |||
288 | switch(insertResponse) | 288 | switch(insertResponse) |
289 | { | 289 | { |
290 | case DataResponse.RESPONSE_OK: | 290 | case DataResponse.RESPONSE_OK: |
291 | OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName); | 291 | OpenSim.Framework.Console.MainLog.Instance.Verbose("grid", "New sim creation successful: " + TheSim.regionName); |
292 | break; | 292 | break; |
293 | case DataResponse.RESPONSE_ERROR: | 293 | case DataResponse.RESPONSE_ERROR: |
294 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName); | 294 | OpenSim.Framework.Console.MainLog.Instance.Warn("storage", "New sim creation failed (Error): " + TheSim.regionName); |
295 | break; | 295 | break; |
296 | case DataResponse.RESPONSE_INVALIDCREDENTIALS: | 296 | case DataResponse.RESPONSE_INVALIDCREDENTIALS: |
297 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName); | 297 | OpenSim.Framework.Console.MainLog.Instance.Warn("storage", "New sim creation failed (Invalid Credentials): " + TheSim.regionName); |
298 | break; | 298 | break; |
299 | case DataResponse.RESPONSE_AUTHREQUIRED: | 299 | case DataResponse.RESPONSE_AUTHREQUIRED: |
300 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName); | 300 | OpenSim.Framework.Console.MainLog.Instance.Warn("storage", "New sim creation failed (Authentication Required): " + TheSim.regionName); |
301 | break; | 301 | break; |
302 | } | 302 | } |
303 | 303 | ||
304 | } | 304 | } |
305 | catch (Exception e) | 305 | catch (Exception e) |
306 | { | 306 | { |
307 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); | 307 | OpenSim.Framework.Console.MainLog.Instance.Warn("storage", "Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); |
308 | OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); | 308 | OpenSim.Framework.Console.MainLog.Instance.Warn("storage", e.ToString()); |
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
@@ -687,12 +687,12 @@ namespace OpenSim.Grid.GridServer | |||
687 | if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null && authkeynode.InnerText != TheSim.regionRecvKey)) | 687 | if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null && authkeynode.InnerText != TheSim.regionRecvKey)) |
688 | { | 688 | { |
689 | kvp.Value.AddProfile(TheSim); | 689 | kvp.Value.AddProfile(TheSim); |
690 | MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); | 690 | MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); |
691 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); | 691 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); |
692 | } | 692 | } |
693 | else | 693 | else |
694 | { | 694 | { |
695 | MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); | 695 | MainLog.Instance.Warn("grid", "Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); |
696 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; | 696 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; |
697 | } | 697 | } |
698 | } | 698 | } |