diff options
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 4c60852..1e457b3 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.GridServer | |||
243 | return response; | 243 | return response; |
244 | } | 244 | } |
245 | 245 | ||
246 | if (TheSim == null) | 246 | if (TheSim == null) // Shouldnt this be in the REST Simulator Set method? |
247 | { | 247 | { |
248 | //NEW REGION | 248 | //NEW REGION |
249 | TheSim = new SimProfileData(); | 249 | TheSim = new SimProfileData(); |
@@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer | |||
279 | switch(insertResponse) | 279 | switch(insertResponse) |
280 | { | 280 | { |
281 | case DataResponse.RESPONSE_OK: | 281 | case DataResponse.RESPONSE_OK: |
282 | Console.WriteLine("New sim creation successful: " + TheSim.regionName); | 282 | OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName); |
283 | break; | 283 | break; |
284 | case DataResponse.RESPONSE_ERROR: | 284 | case DataResponse.RESPONSE_ERROR: |
285 | Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName); | 285 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName); |
286 | break; | 286 | break; |
287 | case DataResponse.RESPONSE_INVALIDCREDENTIALS: | 287 | case DataResponse.RESPONSE_INVALIDCREDENTIALS: |
288 | Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName); | 288 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName); |
289 | break; | 289 | break; |
290 | case DataResponse.RESPONSE_AUTHREQUIRED: | 290 | case DataResponse.RESPONSE_AUTHREQUIRED: |
291 | Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName); | 291 | OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName); |
292 | break; | 292 | break; |
293 | } | 293 | } |
294 | 294 | ||
295 | } | 295 | } |
296 | catch (Exception) | 296 | catch (Exception e) |
297 | { | 297 | { |
298 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); | 298 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); |
299 | } | 299 | } |
@@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer | |||
541 | /// <returns>"OK" or an error</returns> | 541 | /// <returns>"OK" or an error</returns> |
542 | public string RestSetSimMethod(string request, string path, string param) | 542 | public string RestSetSimMethod(string request, string path, string param) |
543 | { | 543 | { |
544 | Console.WriteLine("Processing region update"); | 544 | Console.WriteLine("Processing region update via REST method"); |
545 | SimProfileData TheSim; | 545 | SimProfileData TheSim; |
546 | TheSim = getRegion(new LLUUID(param)); | 546 | TheSim = getRegion(new LLUUID(param)); |
547 | if ((TheSim) == null) | 547 | if ((TheSim) == null) |
@@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer | |||
569 | 569 | ||
570 | if (authkeynode.InnerText != TheSim.regionRecvKey) | 570 | if (authkeynode.InnerText != TheSim.regionRecvKey) |
571 | { | 571 | { |
572 | MainLog.Instance.Warn("Invalid Key Attempt on region update"); | ||
572 | return "ERROR! invalid key"; | 573 | return "ERROR! invalid key"; |
573 | } | 574 | } |
574 | 575 | ||
@@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer | |||
640 | } | 641 | } |
641 | else | 642 | else |
642 | { | 643 | { |
644 | MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); | ||
643 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; | 645 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; |
644 | } | 646 | } |
645 | } | 647 | } |