aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs26
1 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 4346ecb..abaf743 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -162,7 +162,8 @@ namespace OpenSim.Region.Communications.OGS1
162 { 162 {
163 string errorstring = (string) GridRespData["error"]; 163 string errorstring = (string) GridRespData["error"];
164 164
165 Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring)); 165 Exception e = new Exception(
166 String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring));
166 167
167 throw e; 168 throw e;
168 } 169 }
@@ -258,7 +259,10 @@ namespace OpenSim.Region.Communications.OGS1
258 } 259 }
259 catch (SocketException e) 260 catch (SocketException e)
260 { 261 {
261 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", simIp, e); 262 m_log.WarnFormat(
263 "[OGS1 GRID SERVICES]: RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}",
264 simIp, e);
265
262 continue; 266 continue;
263 } 267 }
264 268
@@ -1573,6 +1577,13 @@ namespace OpenSim.Region.Communications.OGS1
1573 1577
1574 int timeOut = 10; //10 seconds 1578 int timeOut = 10; //10 seconds
1575 1579
1580 /// <summary>
1581 /// Check that a region is available for TCP comms. This is necessary for .NET remoting between regions.
1582 /// </summary>
1583 /// <param name="address"></param>
1584 /// <param name="port"></param>
1585 /// <param name="retry"></param>
1586 /// <returns></returns>
1576 public bool CheckRegion(string address, uint port, bool retry) 1587 public bool CheckRegion(string address, uint port, bool retry)
1577 { 1588 {
1578 bool available = false; 1589 bool available = false;
@@ -1593,7 +1604,8 @@ namespace OpenSim.Region.Communications.OGS1
1593 } 1604 }
1594 catch (Exception e) 1605 catch (Exception e)
1595 { 1606 {
1596 m_log.DebugFormat("Callback EndConnect exception: {0}:{1}", e.Message, e.StackTrace); 1607 m_log.DebugFormat(
1608 "[OGS1 GRID SERVICES]: Callback EndConnect exception: {0}:{1}", e.Message, e.StackTrace);
1597 } 1609 }
1598 1610
1599 s.Close(); 1611 s.Close();
@@ -1607,13 +1619,17 @@ namespace OpenSim.Region.Communications.OGS1
1607 } 1619 }
1608 catch (Exception e) 1620 catch (Exception e)
1609 { 1621 {
1610 m_log.DebugFormat("CheckRegion Socket Setup exception: {0}:{1}", e.Message, e.StackTrace); 1622 m_log.DebugFormat(
1623 "[OGS1 GRID SERVICES]: CheckRegion Socket Setup exception: {0}:{1}", e.Message, e.StackTrace);
1624
1611 return false; 1625 return false;
1612 } 1626 }
1613 1627
1614 if (timed_out) 1628 if (timed_out)
1615 { 1629 {
1616 m_log.DebugFormat("socket [{0}] timed out ({1}) waiting to obtain a connection.", m_EndPoint, timeOut * 1000); 1630 m_log.DebugFormat(
1631 "[OGS1 GRID SERVICES]: socket [{0}] timed out ({1}) waiting to obtain a connection.",
1632 m_EndPoint, timeOut * 1000);
1617 1633
1618 if (retry) 1634 if (retry)
1619 { 1635 {