From 827cccb99c39b7dd3ee0ccc3defb9d88e449db52 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 4 Jul 2007 07:45:42 +0000 Subject: Grid Servers: * Sugilite grid server now works with older regions properly (using it on deepgrid for testing) * Sugilite user server still broken with sugilite region server * Reduced the number of compiler warnings to zero Region Servers: * Added debug information to OGS1 Comms to help debug user server connectivity issues. --- OpenSim/Framework/Data.MySQL/MySQLLogData.cs | 2 +- OpenSim/Framework/Data.MySQL/MySQLManager.cs | 10 +++++----- OpenSim/Grid/GridServer/GridManager.cs | 16 +++++++++------- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 3 +++ 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'OpenSim') 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 { database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage); } - catch (Exception e) + catch { database.Reconnect(); } 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 retval.gridRecvKey = (string)reader["gridRecvKey"]; retval.gridSendKey = (string)reader["gridSendKey"]; retval.reservationCompany = (string)reader["resCompany"]; - retval.reservationMaxX = (int)reader["resXMax"]; - retval.reservationMaxY = (int)reader["resYMax"]; - retval.reservationMinX = (int)reader["resXMin"]; - retval.reservationMinY = (int)reader["resYMin"]; + retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString()); + retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString()); + retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString()); + retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString()); retval.reservationName = (string)reader["resName"]; - retval.status = (bool)reader["status"]; + retval.status = Convert.ToInt32(reader["status"].ToString()) == 1; retval.userUUID = new LLUUID((string)reader["userUUID"]); } 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 return response; } - if (TheSim == null) + if (TheSim == null) // Shouldnt this be in the REST Simulator Set method? { //NEW REGION TheSim = new SimProfileData(); @@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer switch(insertResponse) { case DataResponse.RESPONSE_OK: - Console.WriteLine("New sim creation successful: " + TheSim.regionName); + OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName); break; case DataResponse.RESPONSE_ERROR: - Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName); + OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName); break; case DataResponse.RESPONSE_INVALIDCREDENTIALS: - Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName); + OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName); break; case DataResponse.RESPONSE_AUTHREQUIRED: - Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName); + OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName); break; } } - catch (Exception) + catch (Exception e) { OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); } @@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer /// "OK" or an error public string RestSetSimMethod(string request, string path, string param) { - Console.WriteLine("Processing region update"); + Console.WriteLine("Processing region update via REST method"); SimProfileData TheSim; TheSim = getRegion(new LLUUID(param)); if ((TheSim) == null) @@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer if (authkeynode.InnerText != TheSim.regionRecvKey) { + MainLog.Instance.Warn("Invalid Key Attempt on region update"); return "ERROR! invalid key"; } @@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer } else { + MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); return "Unable to update region (RestSetSimMethod): Incorrect auth key."; } } 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 if (!this.listeners.ContainsKey(regionInfo.RegionHandle)) { + MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString()); // initialised = true; httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port ); httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser); @@ -193,6 +194,8 @@ namespace OpenSim.Region.Communications.OGS1 MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString()); } + MainLog.Instance.Verbose("ExpectUser() - Welcoming new user..."); + return new XmlRpcResponse(); } -- cgit v1.1