aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-25 19:39:41 +0000
committerJustin Clarke Casey2008-03-25 19:39:41 +0000
commited9cdbe99f8c108925417e53f7cf85bff4434491 (patch)
tree936f2494ac951c04014454a75630013dd4b3dd1e
parentSet svn:ignore. (diff)
downloadopensim-SC_OLD-ed9cdbe99f8c108925417e53f7cf85bff4434491.zip
opensim-SC_OLD-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.gz
opensim-SC_OLD-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.bz2
opensim-SC_OLD-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.xz
* Temporary hack to swallow neighbour contact problems on startup (in response to osgrid issues)
* Not sure what the effect will be, but can't be any worse than the current constant sim crashes.
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs5
2 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 23b8fb4..a783050 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -226,7 +226,17 @@ namespace OpenSim.Region.Communications.OGS1
226 uint port = Convert.ToUInt32(neighbourData["sim_port"]); 226 uint port = Convert.ToUInt32(neighbourData["sim_port"]);
227 string externalUri = (string) neighbourData["sim_uri"]; 227 string externalUri = (string) neighbourData["sim_uri"];
228 228
229 string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); 229 string externalIpStr = String.Empty;
230 try
231 {
232 externalIpStr = Util.GetHostFromDNS(simIp).ToString();
233 }
234 catch (SocketException e)
235 {
236 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list");
237 continue;
238 }
239
230 SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); 240 SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
231 241
232 sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); 242 sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 318b04a..2f81192 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -296,7 +296,10 @@ namespace OpenSim.Region.Environment.Scenes
296 296
297 // FIXME: Okay, even though we've failed, we're still going to throw the exception on, 297 // FIXME: Okay, even though we've failed, we're still going to throw the exception on,
298 // since I don't know what will happen if we just let the client continue 298 // since I don't know what will happen if we just let the client continue
299 throw e; 299
300 // XXX: Well, decided to swallow the exception instead for now. Let us see how that goes.
301 // throw e;
302
300 } 303 }
301 } 304 }
302 } 305 }