aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WebUtil.cs
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/Framework/WebUtil.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-67990ea7e4d768b6574249082224978c22da0af4.zip
opensim-SC_OLD-67990ea7e4d768b6574249082224978c22da0af4.tar.gz
opensim-SC_OLD-67990ea7e4d768b6574249082224978c22da0af4.tar.bz2
opensim-SC_OLD-67990ea7e4d768b6574249082224978c22da0af4.tar.xz
* Better error logging for failed SimianGrid web service calls
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
-rw-r--r--OpenSim/Framework/WebUtil.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 2843e20..94862a6 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -146,18 +146,23 @@ namespace OpenSim.Framework
146 { 146 {
147 using (Stream responseStream = response.GetResponseStream()) 147 using (Stream responseStream = response.GetResponseStream())
148 { 148 {
149 string responseStr = null;
150
149 try 151 try
150 { 152 {
151 string responseStr = responseStream.GetStreamString(); 153 responseStr = responseStream.GetStreamString();
152 OSD responseOSD = OSDParser.Deserialize(responseStr); 154 OSD responseOSD = OSDParser.Deserialize(responseStr);
153 if (responseOSD.Type == OSDType.Map) 155 if (responseOSD.Type == OSDType.Map)
154 return (OSDMap)responseOSD; 156 return (OSDMap)responseOSD;
155 else 157 else
156 errorMessage = "Response format was invalid."; 158 errorMessage = "Response format was invalid.";
157 } 159 }
158 catch 160 catch (Exception ex)
159 { 161 {
160 errorMessage = "Failed to parse the response."; 162 if (!String.IsNullOrEmpty(responseStr))
163 errorMessage = "Failed to parse the response:\n" + responseStr;
164 else
165 errorMessage = "Failed to retrieve the response: " + ex.Message;
161 } 166 }
162 } 167 }
163 } 168 }