*Fixed storage issue as noted in last commit of the OGS1 GridServer

*Reverted the default remote grid server port back to 8001 (from a port change to debug a previous issue)

5 files changed, 11 insertions, 10 deletions

diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 1aaa775..5fec367 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Data.DB4o
                 if (manager.simProfiles.ContainsKey(uuid))

                     return manager.simProfiles[uuid];

             }

-            throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")");

+            throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + "). Total Registered Regions: " + manager.simProfiles.Count);

         }

 

         /// <summary>

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 142edc0..89ebf94 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridServerURL");

                     if (attri == "")

                     {

-                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:13801/");

+                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");

                         configData.SetAttribute("GridServerURL", this.GridURL);

                     }

                     else

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 816c9fd..4c60852 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -126,9 +126,9 @@ namespace OpenSim.Grid.GridServer
                 {

                     return kvp.Value.GetProfileByLLUUID(uuid);

                 }

-                catch (Exception)

+                catch (Exception e)

                 {

-                    MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);

+                    MainLog.Instance.Warn("Message from Storage: " + e.Message);

                 }

             }

             return null;

@@ -225,10 +225,10 @@ namespace OpenSim.Grid.GridServer
             SimProfileData TheSim = null;

             Hashtable requestData = (Hashtable)request.Params[0];

 

-            Console.WriteLine(requestData.ToString());

             if (requestData.ContainsKey("UUID"))

             {

                 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));

+                

                 logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");

             }

             else if (requestData.ContainsKey("region_handle"))

@@ -269,6 +269,7 @@ namespace OpenSim.Grid.GridServer
                 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";

 

                 TheSim.regionName = (string)requestData["sim_name"];

+                TheSim.UUID = new LLUUID((string)requestData["UUID"]);

 

                 foreach (KeyValuePair<string, IGridData> kvp in _plugins)

                 {

diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 404c252..2e76cee 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Grid.GridServer
             m_gridManager.config = Cfg;

 

             m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");

-            BaseHttpServer httpServer = new BaseHttpServer(13801);

+            BaseHttpServer httpServer = new BaseHttpServer(8001);

             //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);

 

             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);

@@ -143,9 +143,9 @@ namespace OpenSim.Grid.GridServer
             //break;

 

             // lbsa71 : I guess these were never used?

-            //Listener.Prefixes.Add("http://+:13801/gods/");

-            //Listener.Prefixes.Add("http://+:13801/highestuuid/");

-            //Listener.Prefixes.Add("http://+:13801/uuidblocks/");

+            //Listener.Prefixes.Add("http://+:8001/gods/");

+            //Listener.Prefixes.Add("http://+:8001/highestuuid/");

+            //Listener.Prefixes.Add("http://+:8001/uuidblocks/");

 

             httpServer.Start();

 

diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index f57ac52..c7f8255 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -50,7 +50,7 @@ namespace OpenUser.Config.UserConfigDb4o
                         

                         this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");

 

-                        this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:13801/");

+                        this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");

                         this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");

                         this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");

                 }