aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorMelanie2018-09-12 13:13:11 +0100
committerMelanie2018-09-12 13:13:11 +0100
commit39e82cb04349174bfda91dc2952aabf690cfb87e (patch)
tree0b082cf1e4535d1937a96337d330326592432989 /OpenSim/Framework/Servers
parentAdapt to a variable name that has changed in core (diff)
downloadopensim-SC-39e82cb04349174bfda91dc2952aabf690cfb87e.zip
opensim-SC-39e82cb04349174bfda91dc2952aabf690cfb87e.tar.gz
opensim-SC-39e82cb04349174bfda91dc2952aabf690cfb87e.tar.bz2
opensim-SC-39e82cb04349174bfda91dc2952aabf690cfb87e.tar.xz
Squelch "connection reset by peer" exceptions
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 0e4a941..3eb330a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -94,6 +94,13 @@ namespace OpenSim.Framework.Servers.HttpServer
94 response.Send(); 94 response.Send();
95 buffer = null; 95 buffer = null;
96 } 96 }
97 catch (System.Net.Sockets.SocketException ex)
98 {
99 // This is "connection reset by peer", meaning the
100 // requesting server has given up. They need to
101 // fix their timeouts. We don't want to spam the
102 // log with this.
103 }
97 catch (Exception ex) 104 catch (Exception ex)
98 { 105 {
99 m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex); 106 m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
@@ -141,4 +148,4 @@ namespace OpenSim.Framework.Servers.HttpServer
141 return (int)b2.contextHash; 148 return (int)b2.contextHash;
142 } 149 }
143 } 150 }
144} \ No newline at end of file 151}