aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-25 20:05:02 +0000
committerJustin Clarke Casey2008-03-25 20:05:02 +0000
commitad808579a2c5dc0e6ba29ad93c3fe9cea0107a69 (patch)
tree5de8879ac5d6cdec8933b016515544705c0a8471
parent* Temporary hack to swallow neighbour contact problems on startup (in respons... (diff)
downloadopensim-SC_OLD-ad808579a2c5dc0e6ba29ad93c3fe9cea0107a69.zip
opensim-SC_OLD-ad808579a2c5dc0e6ba29ad93c3fe9cea0107a69.tar.gz
opensim-SC_OLD-ad808579a2c5dc0e6ba29ad93c3fe9cea0107a69.tar.bz2
opensim-SC_OLD-ad808579a2c5dc0e6ba29ad93c3fe9cea0107a69.tar.xz
* Print out the exception stacks of resolution failures, temporarily
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs5
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a783050..705d623 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Communications.OGS1
233 } 233 }
234 catch (SocketException e) 234 catch (SocketException e)
235 { 235 {
236 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list"); 236 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", simIp, e);
237 continue; 237 continue;
238 } 238 }
239 239
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 2f81192..c9abd97 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -288,11 +288,12 @@ namespace OpenSim.Region.Environment.Scenes
288 catch (Exception e) 288 catch (Exception e)
289 { 289 {
290 m_log.ErrorFormat( 290 m_log.ErrorFormat(
291 "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3})", 291 "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}",
292 neighbours[i].ExternalHostName, 292 neighbours[i].ExternalHostName,
293 neighbours[i].RegionHandle, 293 neighbours[i].RegionHandle,
294 neighbours[i].RegionLocX, 294 neighbours[i].RegionLocX,
295 neighbours[i].RegionLocY); 295 neighbours[i].RegionLocY,
296 e);
296 297
297 // FIXME: Okay, even though we've failed, we're still going to throw the exception on, 298 // 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 299 // since I don't know what will happen if we just let the client continue