aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-22 18:55:31 -0700
committerJohn Hurliman2010-04-22 18:55:31 -0700
commit67990ea7e4d768b6574249082224978c22da0af4 (patch)
treea29e44015eff1de5b49df47d4f3212f5d338bcb0 /OpenSim/Services/Connectors
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-67990ea7e4d768b6574249082224978c22da0af4.zip
opensim-SC-67990ea7e4d768b6574249082224978c22da0af4.tar.gz
opensim-SC-67990ea7e4d768b6574249082224978c22da0af4.tar.bz2
opensim-SC-67990ea7e4d768b6574249082224978c22da0af4.tar.xz
* Better error logging for failed SimianGrid web service calls
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 79e49a1..3fdee9c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -303,9 +303,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
303 HttpWebResponse response = MultipartForm.Post(request, postParameters); 303 HttpWebResponse response = MultipartForm.Post(request, postParameters);
304 using (Stream responseStream = response.GetResponseStream()) 304 using (Stream responseStream = response.GetResponseStream())
305 { 305 {
306 string responseStr = null;
307
306 try 308 try
307 { 309 {
308 string responseStr = responseStream.GetStreamString(); 310 responseStr = responseStream.GetStreamString();
309 OSD responseOSD = OSDParser.Deserialize(responseStr); 311 OSD responseOSD = OSDParser.Deserialize(responseStr);
310 if (responseOSD.Type == OSDType.Map) 312 if (responseOSD.Type == OSDType.Map)
311 { 313 {
@@ -317,12 +319,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
317 } 319 }
318 else 320 else
319 { 321 {
320 errorMessage = "Response format was invalid."; 322 errorMessage = "Response format was invalid:\n" + responseStr;
321 } 323 }
322 } 324 }
323 catch 325 catch (Exception ex)
324 { 326 {
325 errorMessage = "Failed to parse the response."; 327 if (!String.IsNullOrEmpty(responseStr))
328 errorMessage = "Failed to parse the response:\n" + responseStr;
329 else
330 errorMessage = "Failed to retrieve the response: " + ex.Message;
326 } 331 }
327 } 332 }
328 } 333 }