diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 27a646a..147a011 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -251,11 +251,11 @@ namespace OpenSim.Framework | |||
251 | // This just dumps a warning for any operation that takes more than 100 ms | 251 | // This just dumps a warning for any operation that takes more than 100 ms |
252 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); | 252 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); |
253 | if (tickdiff > LongCallTime) | 253 | if (tickdiff > LongCallTime) |
254 | m_log.InfoFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing", | 254 | m_log.DebugFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing", |
255 | reqnum,url,method,tickdiff,tickdata); | 255 | reqnum,url,method,tickdiff,tickdata); |
256 | } | 256 | } |
257 | 257 | ||
258 | m_log.WarnFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); | 258 | m_log.DebugFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); |
259 | return ErrorResponseMap(errorMessage); | 259 | return ErrorResponseMap(errorMessage); |
260 | } | 260 | } |
261 | 261 | ||
@@ -967,7 +967,7 @@ namespace OpenSim.Framework | |||
967 | } | 967 | } |
968 | catch (Exception e) | 968 | catch (Exception e) |
969 | { | 969 | { |
970 | m_log.WarnFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); | 970 | m_log.DebugFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); |
971 | return deserial; | 971 | return deserial; |
972 | } | 972 | } |
973 | finally | 973 | finally |
@@ -979,8 +979,11 @@ namespace OpenSim.Framework | |||
979 | 979 | ||
980 | try | 980 | try |
981 | { | 981 | { |
982 | using (WebResponse resp = request.GetResponse()) | 982 | using (HttpWebResponse resp = (HttpWebResponse)request.GetResponse()) |
983 | { | 983 | { |
984 | if (resp.StatusCode == HttpStatusCode.NotFound) | ||
985 | return deserial; | ||
986 | |||
984 | if (resp.ContentLength != 0) | 987 | if (resp.ContentLength != 0) |
985 | { | 988 | { |
986 | Stream respStream = resp.GetResponseStream(); | 989 | Stream respStream = resp.GetResponseStream(); |
@@ -989,18 +992,18 @@ namespace OpenSim.Framework | |||
989 | respStream.Close(); | 992 | respStream.Close(); |
990 | } | 993 | } |
991 | else | 994 | else |
992 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb); | 995 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb); |
993 | 996 | ||
994 | } | 997 | } |
995 | } | 998 | } |
996 | catch (System.InvalidOperationException) | 999 | catch (System.InvalidOperationException) |
997 | { | 1000 | { |
998 | // This is what happens when there is invalid XML | 1001 | // This is what happens when there is invalid XML |
999 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); | 1002 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); |
1000 | } | 1003 | } |
1001 | catch (Exception e) | 1004 | catch (Exception e) |
1002 | { | 1005 | { |
1003 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e); | 1006 | m_log.DebugFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e); |
1004 | } | 1007 | } |
1005 | 1008 | ||
1006 | return deserial; | 1009 | return deserial; |