aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs10
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs16
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs3
4 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 66f3399..38f9fd3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Data.MySQL
70 { 70 {
71 database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage); 71 database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
72 } 72 }
73 catch (Exception e) 73 catch
74 { 74 {
75 database.Reconnect(); 75 database.Reconnect();
76 } 76 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index ab478ed..88365a3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Data.MySQL
246 retval.gridRecvKey = (string)reader["gridRecvKey"]; 246 retval.gridRecvKey = (string)reader["gridRecvKey"];
247 retval.gridSendKey = (string)reader["gridSendKey"]; 247 retval.gridSendKey = (string)reader["gridSendKey"];
248 retval.reservationCompany = (string)reader["resCompany"]; 248 retval.reservationCompany = (string)reader["resCompany"];
249 retval.reservationMaxX = (int)reader["resXMax"]; 249 retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
250 retval.reservationMaxY = (int)reader["resYMax"]; 250 retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
251 retval.reservationMinX = (int)reader["resXMin"]; 251 retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
252 retval.reservationMinY = (int)reader["resYMin"]; 252 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
253 retval.reservationName = (string)reader["resName"]; 253 retval.reservationName = (string)reader["resName"];
254 retval.status = (bool)reader["status"]; 254 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
255 retval.userUUID = new LLUUID((string)reader["userUUID"]); 255 retval.userUUID = new LLUUID((string)reader["userUUID"]);
256 256
257 } 257 }
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
243 return response; 243 return response;
244 } 244 }
245 245
246 if (TheSim == null) 246 if (TheSim == null) // Shouldnt this be in the REST Simulator Set method?
247 { 247 {
248 //NEW REGION 248 //NEW REGION
249 TheSim = new SimProfileData(); 249 TheSim = new SimProfileData();
@@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer
279 switch(insertResponse) 279 switch(insertResponse)
280 { 280 {
281 case DataResponse.RESPONSE_OK: 281 case DataResponse.RESPONSE_OK:
282 Console.WriteLine("New sim creation successful: " + TheSim.regionName); 282 OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName);
283 break; 283 break;
284 case DataResponse.RESPONSE_ERROR: 284 case DataResponse.RESPONSE_ERROR:
285 Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName); 285 OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName);
286 break; 286 break;
287 case DataResponse.RESPONSE_INVALIDCREDENTIALS: 287 case DataResponse.RESPONSE_INVALIDCREDENTIALS:
288 Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName); 288 OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
289 break; 289 break;
290 case DataResponse.RESPONSE_AUTHREQUIRED: 290 case DataResponse.RESPONSE_AUTHREQUIRED:
291 Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName); 291 OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName);
292 break; 292 break;
293 } 293 }
294 294
295 } 295 }
296 catch (Exception) 296 catch (Exception e)
297 { 297 {
298 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); 298 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);
299 } 299 }
@@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer
541 /// <returns>"OK" or an error</returns> 541 /// <returns>"OK" or an error</returns>
542 public string RestSetSimMethod(string request, string path, string param) 542 public string RestSetSimMethod(string request, string path, string param)
543 { 543 {
544 Console.WriteLine("Processing region update"); 544 Console.WriteLine("Processing region update via REST method");
545 SimProfileData TheSim; 545 SimProfileData TheSim;
546 TheSim = getRegion(new LLUUID(param)); 546 TheSim = getRegion(new LLUUID(param));
547 if ((TheSim) == null) 547 if ((TheSim) == null)
@@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer
569 569
570 if (authkeynode.InnerText != TheSim.regionRecvKey) 570 if (authkeynode.InnerText != TheSim.regionRecvKey)
571 { 571 {
572 MainLog.Instance.Warn("Invalid Key Attempt on region update");
572 return "ERROR! invalid key"; 573 return "ERROR! invalid key";
573 } 574 }
574 575
@@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer
640 } 641 }
641 else 642 else
642 { 643 {
644 MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + ".");
643 return "Unable to update region (RestSetSimMethod): Incorrect auth key."; 645 return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
644 } 646 }
645 } 647 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a11995a..99e9c96 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Communications.OGS1
64 64
65 if (!this.listeners.ContainsKey(regionInfo.RegionHandle)) 65 if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
66 { 66 {
67 MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString());
67 // initialised = true; 68 // initialised = true;
68 httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port ); 69 httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );
69 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser); 70 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
@@ -193,6 +194,8 @@ namespace OpenSim.Region.Communications.OGS1
193 MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString()); 194 MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
194 } 195 }
195 196
197 MainLog.Instance.Verbose("ExpectUser() - Welcoming new user...");
198
196 return new XmlRpcResponse(); 199 return new XmlRpcResponse();
197 } 200 }
198 201