aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authormingchen2007-07-03 19:26:35 +0000
committermingchen2007-07-03 19:26:35 +0000
commit78e420f48bc8ce79f45c5a90d8ebb4004d7993e7 (patch)
treef48c150972b59371371b69a49ea4991e1cbafac3 /OpenSim/Grid
parent*Removed GridInfo class as it has been previously replaced with the much bett... (diff)
downloadopensim-SC_OLD-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.zip
opensim-SC_OLD-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.gz
opensim-SC_OLD-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.bz2
opensim-SC_OLD-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.xz
*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)
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs7
-rw-r--r--OpenSim/Grid/GridServer/Main.cs8
-rw-r--r--OpenSim/Grid/UserServer.Config/DbUserConfig.cs2
3 files changed, 9 insertions, 8 deletions
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
126 { 126 {
127 return kvp.Value.GetProfileByLLUUID(uuid); 127 return kvp.Value.GetProfileByLLUUID(uuid);
128 } 128 }
129 catch (Exception) 129 catch (Exception e)
130 { 130 {
131 MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 131 MainLog.Instance.Warn("Message from Storage: " + e.Message);
132 } 132 }
133 } 133 }
134 return null; 134 return null;
@@ -225,10 +225,10 @@ namespace OpenSim.Grid.GridServer
225 SimProfileData TheSim = null; 225 SimProfileData TheSim = null;
226 Hashtable requestData = (Hashtable)request.Params[0]; 226 Hashtable requestData = (Hashtable)request.Params[0];
227 227
228 Console.WriteLine(requestData.ToString());
229 if (requestData.ContainsKey("UUID")) 228 if (requestData.ContainsKey("UUID"))
230 { 229 {
231 TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 230 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
231
232 logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 232 logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
233 } 233 }
234 else if (requestData.ContainsKey("region_handle")) 234 else if (requestData.ContainsKey("region_handle"))
@@ -269,6 +269,7 @@ namespace OpenSim.Grid.GridServer
269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
270 270
271 TheSim.regionName = (string)requestData["sim_name"]; 271 TheSim.regionName = (string)requestData["sim_name"];
272 TheSim.UUID = new LLUUID((string)requestData["UUID"]);
272 273
273 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 274 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
274 { 275 {
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
121 m_gridManager.config = Cfg; 121 m_gridManager.config = Cfg;
122 122
123 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 123 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
124 BaseHttpServer httpServer = new BaseHttpServer(13801); 124 BaseHttpServer httpServer = new BaseHttpServer(8001);
125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
126 126
127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
@@ -143,9 +143,9 @@ namespace OpenSim.Grid.GridServer
143 //break; 143 //break;
144 144
145 // lbsa71 : I guess these were never used? 145 // lbsa71 : I guess these were never used?
146 //Listener.Prefixes.Add("http://+:13801/gods/"); 146 //Listener.Prefixes.Add("http://+:8001/gods/");
147 //Listener.Prefixes.Add("http://+:13801/highestuuid/"); 147 //Listener.Prefixes.Add("http://+:8001/highestuuid/");
148 //Listener.Prefixes.Add("http://+:13801/uuidblocks/"); 148 //Listener.Prefixes.Add("http://+:8001/uuidblocks/");
149 149
150 httpServer.Start(); 150 httpServer.Start();
151 151
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
50 50
51 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
52 52
53 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:13801/"); 53 this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
54 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null"); 54 this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
55 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); 55 this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
56 } 56 }