aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-26 12:44:43 +0000
committerJustin Clarke Casey2008-03-26 12:44:43 +0000
commitbcd68fb6c4a68129b4f2786016305b00085eeb54 (patch)
tree6438fc0689b25a81b474bd87aea14b5b5fd00517
parent* Increase information in simulator_login log messages (diff)
downloadopensim-SC-bcd68fb6c4a68129b4f2786016305b00085eeb54.zip
opensim-SC-bcd68fb6c4a68129b4f2786016305b00085eeb54.tar.gz
opensim-SC-bcd68fb6c4a68129b4f2786016305b00085eeb54.tar.bz2
opensim-SC-bcd68fb6c4a68129b4f2786016305b00085eeb54.tar.xz
* More log messages in the region registration process for debug purposes. Some of these may be temporary
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs15
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 21ca573..cf1ead1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -92,6 +92,10 @@ namespace OpenSim.Region.Communications.OGS1
92 // see IGridServices 92 // see IGridServices
93 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 93 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
94 { 94 {
95 m_log.DebugFormat(
96 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}",
97 regionInfo.RegionName, serversInfo.GridURL);
98
95 Hashtable GridParams = new Hashtable(); 99 Hashtable GridParams = new Hashtable();
96 // Login / Authentication 100 // Login / Authentication
97 101
@@ -133,7 +137,7 @@ namespace OpenSim.Region.Communications.OGS1
133 catch (Exception ex) 137 catch (Exception ex)
134 { 138 {
135 m_log.ErrorFormat( 139 m_log.ErrorFormat(
136 "Unable to connect to grid at {0}. Grid server not running? Exception {1}", 140 "[OGS1 GRID SERVICES]: Unable to connect to grid at {0}. Grid server not running? Exception {1}",
137 serversInfo.GridURL, ex); 141 serversInfo.GridURL, ex);
138 142
139 throw(ex); 143 throw(ex);
@@ -145,7 +149,10 @@ namespace OpenSim.Region.Communications.OGS1
145 if (GridRespData.ContainsKey("error")) 149 if (GridRespData.ContainsKey("error"))
146 { 150 {
147 string errorstring = (string) GridRespData["error"]; 151 string errorstring = (string) GridRespData["error"];
148 m_log.ErrorFormat("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring); 152 m_log.ErrorFormat(
153 "[OGS1 GRID SERVICES]: Unable to connect to grid at {0}: {1}",
154 serversInfo.GridURL, errorstring);
155
149 return null; 156 return null;
150 } 157 }
151 else 158 else
@@ -159,6 +166,10 @@ namespace OpenSim.Region.Communications.OGS1
159 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); 166 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
160 } 167 }
161 } 168 }
169
170 m_log.InfoFormat(
171 "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}",
172 regionInfo.RegionName, serversInfo.GridURL);
162 } 173 }
163 return m_localBackend.RegisterRegion(regionInfo); 174 return m_localBackend.RegisterRegion(regionInfo);
164 } 175 }