aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-12 16:57:56 +0000
committerJustin Clarke Casey2008-05-12 16:57:56 +0000
commitd3fb6039cad7b828dec8a1d7aef66aa10e6afdf2 (patch)
treec7e3a49e79878e4ea2958ee6ce188b2f0559be80 /OpenSim/Region/Communications
parent* Minor: Change 'delete region' message to region logout message (diff)
downloadopensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.zip
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.gz
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.bz2
opensim-SC_OLD-d3fb6039cad7b828dec8a1d7aef66aa10e6afdf2.tar.xz
* If a region running in grid mode fails to login to the grid service, startup will now terminate instead of carrying on (and thus burying the error message)
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs25
1 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index eada868..03fd448 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1
94 // see IGridServices 94 // see IGridServices
95 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 95 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
96 { 96 {
97 m_log.DebugFormat( 97 m_log.InfoFormat(
98 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", 98 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}",
99 regionInfo.RegionName, serversInfo.GridURL); 99 regionInfo.RegionName, serversInfo.GridURL);
100 100
@@ -137,14 +137,16 @@ namespace OpenSim.Region.Communications.OGS1
137 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); 137 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
138 GridResp = GridReq.Send(serversInfo.GridURL, 30000); 138 GridResp = GridReq.Send(serversInfo.GridURL, 30000);
139 } 139 }
140 catch (Exception ex) 140 catch (Exception e)
141 { 141 {
142 m_log.ErrorFormat( 142 Exception e2
143 "[OGS1 GRID SERVICES]: Unable to connect to grid at {0}. Grid server not running? Exception {1}", 143 = new Exception(
144 serversInfo.GridURL, ex); 144 String.Format("Unable to connect to grid at {0}. Grid service not running?", serversInfo.GridURL),
145 e);
145 146
146 throw(ex); 147 throw(e2);
147 } 148 }
149
148 Hashtable GridRespData = (Hashtable)GridResp.Value; 150 Hashtable GridRespData = (Hashtable)GridResp.Value;
149 Hashtable griddatahash = GridRespData; 151 Hashtable griddatahash = GridRespData;
150 152
@@ -152,11 +154,10 @@ namespace OpenSim.Region.Communications.OGS1
152 if (GridRespData.ContainsKey("error")) 154 if (GridRespData.ContainsKey("error"))
153 { 155 {
154 string errorstring = (string) GridRespData["error"]; 156 string errorstring = (string) GridRespData["error"];
155 m_log.ErrorFormat(
156 "[OGS1 GRID SERVICES]: Unable to connect to grid at {0}: {1}",
157 serversInfo.GridURL, errorstring);
158 157
159 return null; 158 Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring));
159
160 throw e;
160 } 161 }
161 else 162 else
162 { 163 {
@@ -292,7 +293,7 @@ namespace OpenSim.Region.Communications.OGS1
292 293
293 if (responseData.ContainsKey("error")) 294 if (responseData.ContainsKey("error"))
294 { 295 {
295 Console.WriteLine("error received from grid server" + responseData["error"]); 296 m_log.WarnFormat("[OGS1 GRID SERVICES]: Error received from grid server: {0}", responseData["error"]);
296 return null; 297 return null;
297 } 298 }
298 299
@@ -355,7 +356,7 @@ namespace OpenSim.Region.Communications.OGS1
355 356
356 if (responseData.ContainsKey("error")) 357 if (responseData.ContainsKey("error"))
357 { 358 {
358 m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]); 359 m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server: " + responseData["error"]);
359 return null; 360 return null;
360 } 361 }
361 362