OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Better error logging for failed SimianGrid web service calls

slimupdates
John Hurliman 2010-04-22 18:55:31 -07:00
parent a7449a82bc
commit 67990ea7e4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/WebUtil.cs
View File

@ -146,18 +146,23 @@ namespace OpenSim.Framework
{ {
using (Stream responseStream = response.GetResponseStream()) using (Stream responseStream = response.GetResponseStream())
{ {
string responseStr = null;
try try
{ {
string responseStr = responseStream.GetStreamString(); responseStr = responseStream.GetStreamString();
OSD responseOSD = OSDParser.Deserialize(responseStr); OSD responseOSD = OSDParser.Deserialize(responseStr);
if (responseOSD.Type == OSDType.Map) if (responseOSD.Type == OSDType.Map)
return (OSDMap)responseOSD; return (OSDMap)responseOSD;
else else
errorMessage = "Response format was invalid."; errorMessage = "Response format was invalid.";
} }
catch catch (Exception ex)
{ {
errorMessage = "Failed to parse the response."; if (!String.IsNullOrEmpty(responseStr))
errorMessage = "Failed to parse the response:\n" + responseStr;
else
errorMessage = "Failed to retrieve the response: " + ex.Message;
} }
} }
} }

13
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
View File

@ -303,9 +303,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
HttpWebResponse response = MultipartForm.Post(request, postParameters); HttpWebResponse response = MultipartForm.Post(request, postParameters);
using (Stream responseStream = response.GetResponseStream()) using (Stream responseStream = response.GetResponseStream())
{ {
string responseStr = null;
try try
{ {
string responseStr = responseStream.GetStreamString(); responseStr = responseStream.GetStreamString();
OSD responseOSD = OSDParser.Deserialize(responseStr); OSD responseOSD = OSDParser.Deserialize(responseStr);
if (responseOSD.Type == OSDType.Map) if (responseOSD.Type == OSDType.Map)
{ {
@ -317,12 +319,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
else else
{ {
errorMessage = "Response format was invalid."; errorMessage = "Response format was invalid:\n" + responseStr;
} }
} }
catch catch (Exception ex)
{ {
errorMessage = "Failed to parse the response."; if (!String.IsNullOrEmpty(responseStr))
errorMessage = "Failed to parse the response:\n" + responseStr;
else
errorMessage = "Failed to retrieve the response: " + ex.Message;
} }
} }
} }