From 827cccb99c39b7dd3ee0ccc3defb9d88e449db52 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 4 Jul 2007 07:45:42 +0000
Subject: Grid Servers: * Sugilite grid server now works with older regions
 properly (using it on deepgrid for testing) * Sugilite user server still
 broken with sugilite region server * Reduced the number of compiler warnings
 to zero Region Servers: * Added debug information to OGS1 Comms to help debug
 user server connectivity issues.

---
 OpenSim/Grid/GridServer/GridManager.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Grid/GridServer')

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
                 return response;
             }
 
-            if (TheSim == null)
+            if (TheSim == null) // Shouldnt this be in the REST Simulator Set method?
             {
                 //NEW REGION
                 TheSim = new SimProfileData();
@@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer
                         switch(insertResponse)
                         {
                             case DataResponse.RESPONSE_OK:
-                                Console.WriteLine("New sim creation successful: " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName);
                                 break;
                             case DataResponse.RESPONSE_ERROR:
-                                Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName);
                                 break;
                             case DataResponse.RESPONSE_INVALIDCREDENTIALS:
-                                Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
                                 break;
                             case DataResponse.RESPONSE_AUTHREQUIRED:
-                                Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName);
                                 break;
                         }
                         
                     }
-                    catch (Exception)
+                    catch (Exception e)
                     {
                         OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);
                     }
@@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer
         /// <returns>"OK" or an error</returns>
         public string RestSetSimMethod(string request, string path, string param)
         {
-            Console.WriteLine("Processing region update");
+            Console.WriteLine("Processing region update via REST method");
             SimProfileData TheSim;
             TheSim = getRegion(new LLUUID(param));
             if ((TheSim) == null)
@@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer
 
             if (authkeynode.InnerText != TheSim.regionRecvKey)
             {
+                MainLog.Instance.Warn("Invalid Key Attempt on region update");
                 return "ERROR! invalid key";
             }
 
@@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer
                         }
                         else
                         {
+                            MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + ".");
                             return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
                         }
                     }
-- 
cgit v1.1