aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-06-12 13:29:14 +0100
committerUbitUmarov2017-06-12 13:29:14 +0100
commit70be8ba6defc5ef385ac7b7f030361f8392e3dc4 (patch)
treee706c1e69bbd881506ec79ab0c144c6f79dc617b /OpenSim/Framework
parenttry to mk jenkins happy (diff)
downloadopensim-SC_OLD-70be8ba6defc5ef385ac7b7f030361f8392e3dc4.zip
opensim-SC_OLD-70be8ba6defc5ef385ac7b7f030361f8392e3dc4.tar.gz
opensim-SC_OLD-70be8ba6defc5ef385ac7b7f030361f8392e3dc4.tar.bz2
opensim-SC_OLD-70be8ba6defc5ef385ac7b7f030361f8392e3dc4.tar.xz
make some web request errors visible, so cause of later asset not found is clear
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs20
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 7b085d0..48078ad 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1262,18 +1262,24 @@ namespace OpenSim.Framework
1262 { 1262 {
1263 if (hwr.StatusCode == HttpStatusCode.NotFound) 1263 if (hwr.StatusCode == HttpStatusCode.NotFound)
1264 return deserial; 1264 return deserial;
1265
1265 if (hwr.StatusCode == HttpStatusCode.Unauthorized) 1266 if (hwr.StatusCode == HttpStatusCode.Unauthorized)
1266 { 1267 {
1267 m_log.Error(string.Format( 1268 m_log.ErrorFormat("[SynchronousRestObjectRequester]: Web request {0} requires authentication",
1268 "[SynchronousRestObjectRequester]: Web request {0} requires authentication ", 1269 requestUrl);
1269 requestUrl)); 1270 }
1270 return deserial; 1271 else
1272 {
1273 m_log.WarnFormat("[SynchronousRestObjectRequester]: Web request {0} returned error: {1}",
1274 requestUrl, hwr.StatusCode);
1271 } 1275 }
1272 } 1276 }
1273 else 1277 else
1274 m_log.Error(string.Format( 1278 m_log.ErrorFormat(
1275 "[SynchronousRestObjectRequester]: WebException for {0} {1} {2} ", 1279 "[SynchronousRestObjectRequester]: WebException for {0} {1} {2} {3}",
1276 verb, requestUrl, typeof(TResponse).ToString()), e); 1280 verb, requestUrl, typeof(TResponse).ToString(), e.Message);
1281
1282 return deserial;
1277 } 1283 }
1278 } 1284 }
1279 catch (System.InvalidOperationException) 1285 catch (System.InvalidOperationException)