aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
authormingchen2007-07-03 17:03:14 +0000
committermingchen2007-07-03 17:03:14 +0000
commite06ffb3981d29ddb3383690b4a05dc684813b6d9 (patch)
tree5f8fcfe04d949007462689572988dfcc687d5ceb /OpenSim/Grid/GridServer
parent*Renamed OGS1 XmlRpcLoginToSimulatorMethod to the more appropriate XmlRpcSimu... (diff)
downloadopensim-SC_OLD-e06ffb3981d29ddb3383690b4a05dc684813b6d9.zip
opensim-SC_OLD-e06ffb3981d29ddb3383690b4a05dc684813b6d9.tar.gz
opensim-SC_OLD-e06ffb3981d29ddb3383690b4a05dc684813b6d9.tar.bz2
opensim-SC_OLD-e06ffb3981d29ddb3383690b4a05dc684813b6d9.tar.xz
*Removed GridInfo class as it has been previously replaced with the much better NetworkServersInfo class
*Got the GridServer in OGS1 to go through with registering the region, but the actual storage of the region isnt working right now. **After this is fixed, grid mode should work!
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs21
-rw-r--r--OpenSim/Grid/GridServer/Main.cs13
2 files changed, 24 insertions, 10 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 824a39e..816c9fd 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -217,7 +217,6 @@ namespace OpenSim.Grid.GridServer
217 /// <returns>Startup parameters</returns> 217 /// <returns>Startup parameters</returns>
218 public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request) 218 public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request)
219 { 219 {
220 Console.WriteLine("XMLRPC SIMULATOR LOGIN METHOD CALLED");
221 220
222 XmlRpcResponse response = new XmlRpcResponse(); 221 XmlRpcResponse response = new XmlRpcResponse();
223 Hashtable responseData = new Hashtable(); 222 Hashtable responseData = new Hashtable();
@@ -229,7 +228,6 @@ namespace OpenSim.Grid.GridServer
229 Console.WriteLine(requestData.ToString()); 228 Console.WriteLine(requestData.ToString());
230 if (requestData.ContainsKey("UUID")) 229 if (requestData.ContainsKey("UUID"))
231 { 230 {
232 Console.WriteLine("...VIA UUID");
233 TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 231 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
234 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.");
235 } 233 }
@@ -248,7 +246,6 @@ namespace OpenSim.Grid.GridServer
248 if (TheSim == null) 246 if (TheSim == null)
249 { 247 {
250 //NEW REGION 248 //NEW REGION
251 Console.WriteLine("THIS IS A NEW REGION...ADDING");
252 TheSim = new SimProfileData(); 249 TheSim = new SimProfileData();
253 250
254 TheSim.regionRecvKey = config.SimRecvKey; 251 TheSim.regionRecvKey = config.SimRecvKey;
@@ -277,7 +274,23 @@ namespace OpenSim.Grid.GridServer
277 { 274 {
278 try 275 try
279 { 276 {
280 Console.WriteLine("ADDED");kvp.Value.AddProfile(TheSim); 277 DataResponse insertResponse = kvp.Value.AddProfile(TheSim);
278 switch(insertResponse)
279 {
280 case DataResponse.RESPONSE_OK:
281 Console.WriteLine("New sim creation successful: " + TheSim.regionName);
282 break;
283 case DataResponse.RESPONSE_ERROR:
284 Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName);
285 break;
286 case DataResponse.RESPONSE_INVALIDCREDENTIALS:
287 Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
288 break;
289 case DataResponse.RESPONSE_AUTHREQUIRED:
290 Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName);
291 break;
292 }
293
281 } 294 }
282 catch (Exception) 295 catch (Exception)
283 { 296 {
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 509549e..404c252 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -76,10 +76,11 @@ namespace OpenSim.Grid.GridServer
76 76
77 private void Work() 77 private void Work()
78 { 78 {
79 m_console.Notice("Enter help for a list of commands\n");
80
79 while (true) 81 while (true)
80 { 82 {
81 Thread.Sleep(5000); 83 m_console.MainLogPrompt();
82 // should flush the DB etc here
83 } 84 }
84 } 85 }
85 86
@@ -120,7 +121,7 @@ namespace OpenSim.Grid.GridServer
120 m_gridManager.config = Cfg; 121 m_gridManager.config = Cfg;
121 122
122 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 123 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
123 BaseHttpServer httpServer = new BaseHttpServer(8001); 124 BaseHttpServer httpServer = new BaseHttpServer(13801);
124 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
125 126
126 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
@@ -142,9 +143,9 @@ namespace OpenSim.Grid.GridServer
142 //break; 143 //break;
143 144
144 // lbsa71 : I guess these were never used? 145 // lbsa71 : I guess these were never used?
145 //Listener.Prefixes.Add("http://+:8001/gods/"); 146 //Listener.Prefixes.Add("http://+:13801/gods/");
146 //Listener.Prefixes.Add("http://+:8001/highestuuid/"); 147 //Listener.Prefixes.Add("http://+:13801/highestuuid/");
147 //Listener.Prefixes.Add("http://+:8001/uuidblocks/"); 148 //Listener.Prefixes.Add("http://+:13801/uuidblocks/");
148 149
149 httpServer.Start(); 150 httpServer.Start();
150 151