diff options
author | Justin Clark-Casey (justincc) | 2012-06-13 00:03:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-13 00:03:44 +0100 |
commit | c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0 (patch) | |
tree | 1d86b771a74c688932ea51160cd648cfe9b45829 /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |
parent | Remove accidental timeout left in during earlier debugging. Has been in sinc... (diff) | |
download | opensim-SC-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.zip opensim-SC-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.tar.gz opensim-SC-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.tar.bz2 opensim-SC-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.tar.xz |
Don't include time to transmit response back to requester when assessing slow handling of requests.
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index f96fd1f..3252251 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -140,9 +140,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
140 | foreach (object o in m_requests) | 140 | foreach (object o in m_requests) |
141 | { | 141 | { |
142 | PollServiceHttpRequest req = (PollServiceHttpRequest) o; | 142 | PollServiceHttpRequest req = (PollServiceHttpRequest) o; |
143 | m_server.DoHTTPGruntWork( | 143 | PollServiceWorkerThread.DoHTTPGruntWork( |
144 | req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id), | 144 | m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id)); |
145 | new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext)); | ||
146 | } | 145 | } |
147 | 146 | ||
148 | m_requests.Clear(); | 147 | m_requests.Clear(); |
@@ -151,6 +150,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
151 | { | 150 | { |
152 | t.Abort(); | 151 | t.Abort(); |
153 | } | 152 | } |
153 | |||
154 | m_running = false; | 154 | m_running = false; |
155 | } | 155 | } |
156 | } | 156 | } |