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

Better error handling for expect_hg_user on the HG.

0.6.2-post-fixes
diva 2008-12-24 00:03:33 +00:00
parent 318de200bd
commit 857535550c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -620,7 +620,16 @@ namespace OpenSim.Region.Communications.Hypergrid
string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/"; string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/";
//Console.WriteLine("XXX uri: " + uri); //Console.WriteLine("XXX uri: " + uri);
XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams); XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams);
XmlRpcResponse reply = request.Send(uri, 6000); XmlRpcResponse reply;
try
{
reply = request.Send(uri, 6000);
}
catch (Exception e)
{
m_log.Warn("[HGrid]: Failed to notify region about user. Reason: " + e.Message);
return false;
}
if (!reply.IsFault) if (!reply.IsFault)
{ {

3
OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
View File

@ -237,7 +237,8 @@ namespace OpenSim.Region.Communications.Hypergrid
Console.WriteLine("XXX Going local-grid region XXX"); Console.WriteLine("XXX Going local-grid region XXX");
RegionInfo regInfo = RequestNeighbourInfo(regionHandle); RegionInfo regInfo = RequestNeighbourInfo(regionHandle);
if (regInfo != null) if (regInfo != null)
InformRegionOfUser(regInfo, agentData); if (!InformRegionOfUser(regInfo, agentData))
return false;
return m_remoteBackend.InformRegionOfChildAgent(regionHandle, agentData); return m_remoteBackend.InformRegionOfChildAgent(regionHandle, agentData);
} }