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

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.
Sugilite
Adam Frisby 2007-07-04 07:45:42 +00:00
parent 249ce4cf6f
commit 827cccb99c
5 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenGridServices.sln
View File

@ -29,17 +29,6 @@ Global
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

2
OpenSim/Framework/Data.MySQL/MySQLLogData.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Framework.Data.MySQL
{ {
database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage); database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
} }
catch (Exception e) catch
{ {
database.Reconnect(); database.Reconnect();
} }

10
OpenSim/Framework/Data.MySQL/MySQLManager.cs
View File

@ -246,12 +246,12 @@ namespace OpenSim.Framework.Data.MySQL
retval.gridRecvKey = (string)reader["gridRecvKey"]; retval.gridRecvKey = (string)reader["gridRecvKey"];
retval.gridSendKey = (string)reader["gridSendKey"]; retval.gridSendKey = (string)reader["gridSendKey"];
retval.reservationCompany = (string)reader["resCompany"]; retval.reservationCompany = (string)reader["resCompany"];
retval.reservationMaxX = (int)reader["resXMax"]; retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
retval.reservationMaxY = (int)reader["resYMax"]; retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
retval.reservationMinX = (int)reader["resXMin"]; retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
retval.reservationMinY = (int)reader["resYMin"]; retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
retval.reservationName = (string)reader["resName"]; 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"]); retval.userUUID = new LLUUID((string)reader["userUUID"]);
} }

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

@ -243,7 +243,7 @@ namespace OpenSim.Grid.GridServer
return response; return response;
} }
if (TheSim == null) if (TheSim == null) // Shouldnt this be in the REST Simulator Set method?
{ {
//NEW REGION //NEW REGION
TheSim = new SimProfileData(); TheSim = new SimProfileData();
@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer
switch(insertResponse) switch(insertResponse)
{ {
case DataResponse.RESPONSE_OK: 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; break;
case DataResponse.RESPONSE_ERROR: 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; break;
case DataResponse.RESPONSE_INVALIDCREDENTIALS: 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; break;
case DataResponse.RESPONSE_AUTHREQUIRED: 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; break;
} }
} }
catch (Exception) catch (Exception e)
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); 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
/// <returns>"OK" or an error</returns> /// <returns>"OK" or an error</returns>
public string RestSetSimMethod(string request, string path, string param) public string RestSetSimMethod(string request, string path, string param)
{ {
Console.WriteLine("Processing region update"); Console.WriteLine("Processing region update via REST method");
SimProfileData TheSim; SimProfileData TheSim;
TheSim = getRegion(new LLUUID(param)); TheSim = getRegion(new LLUUID(param));
if ((TheSim) == null) if ((TheSim) == null)
@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer
if (authkeynode.InnerText != TheSim.regionRecvKey) if (authkeynode.InnerText != TheSim.regionRecvKey)
{ {
MainLog.Instance.Warn("Invalid Key Attempt on region update");
return "ERROR! invalid key"; return "ERROR! invalid key";
} }
@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer
} }
else 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."; return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
} }
} }

3
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -64,6 +64,7 @@ namespace OpenSim.Region.Communications.OGS1
if (!this.listeners.ContainsKey(regionInfo.RegionHandle)) if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
{ {
MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString());
// initialised = true; // initialised = true;
httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port ); httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );
httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser); 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.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
} }
MainLog.Instance.Verbose("ExpectUser() - Welcoming new user...");
return new XmlRpcResponse(); return new XmlRpcResponse();
} }