OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*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)
Sugilite
mingchen 2007-07-03 19:26:35 +00:00
parent e06ffb3981
commit 78e420f48b
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Data.DB4o/DB4oGridData.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Framework.Data.DB4o
if (manager.simProfiles.ContainsKey(uuid)) if (manager.simProfiles.ContainsKey(uuid))
return manager.simProfiles[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> /// <summary>

2
OpenSim/Framework/General/Types/NetworkServersInfo.cs
View File

@ -121,7 +121,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("GridServerURL"); attri = configData.GetAttribute("GridServerURL");
if (attri == "") 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); configData.SetAttribute("GridServerURL", this.GridURL);
} }
else else

7
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -126,9 +126,9 @@ namespace OpenSim.Grid.GridServer
{ {
return kvp.Value.GetProfileByLLUUID(uuid); 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; return null;
@ -225,10 +225,10 @@ namespace OpenSim.Grid.GridServer
SimProfileData TheSim = null; SimProfileData TheSim = null;
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
Console.WriteLine(requestData.ToString());
if (requestData.ContainsKey("UUID")) if (requestData.ContainsKey("UUID"))
{ {
TheSim = getRegion(new LLUUID((string)requestData["UUID"])); TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
} }
else if (requestData.ContainsKey("region_handle")) else if (requestData.ContainsKey("region_handle"))
@ -269,6 +269,7 @@ namespace OpenSim.Grid.GridServer
TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
TheSim.regionName = (string)requestData["sim_name"]; TheSim.regionName = (string)requestData["sim_name"];
TheSim.UUID = new LLUUID((string)requestData["UUID"]);
foreach (KeyValuePair<string, IGridData> kvp in _plugins) foreach (KeyValuePair<string, IGridData> kvp in _plugins)
{ {

8
OpenSim/Grid/GridServer/Main.cs
View File

@ -121,7 +121,7 @@ namespace OpenSim.Grid.GridServer
m_gridManager.config = Cfg; m_gridManager.config = Cfg;
m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 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); //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
@ -143,9 +143,9 @@ namespace OpenSim.Grid.GridServer
//break; //break;
// lbsa71 : I guess these were never used? // lbsa71 : I guess these were never used?
//Listener.Prefixes.Add("http://+:13801/gods/"); //Listener.Prefixes.Add("http://+:8001/gods/");
//Listener.Prefixes.Add("http://+:13801/highestuuid/"); //Listener.Prefixes.Add("http://+:8001/highestuuid/");
//Listener.Prefixes.Add("http://+:13801/uuidblocks/"); //Listener.Prefixes.Add("http://+:8001/uuidblocks/");
httpServer.Start(); httpServer.Start();

2
OpenSim/Grid/UserServer.Config/DbUserConfig.cs
View File

@ -50,7 +50,7 @@ namespace OpenUser.Config.UserConfigDb4o
this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 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.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
} }