aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-13 00:03:44 +0100
committerJustin Clark-Casey (justincc)2012-06-13 00:03:44 +0100
commitc6e375291a8fa3dbdcbd25cfb64bf0d536707fb0 (patch)
tree1d86b771a74c688932ea51160cd648cfe9b45829 /OpenSim/Capabilities
parentRemove accidental timeout left in during earlier debugging. Has been in sinc... (diff)
downloadopensim-SC_OLD-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.zip
opensim-SC_OLD-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.tar.gz
opensim-SC_OLD-c6e375291a8fa3dbdcbd25cfb64bf0d536707fb0.tar.bz2
opensim-SC_OLD-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/Capabilities')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index abdbc72..ae6c44b 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Capabilities.Handlers
77 { 77 {
78 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service"); 78 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
79 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; 79 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
80 return null;
81 } 80 }
82 81
83 UUID textureID; 82 UUID textureID;
@@ -115,7 +114,6 @@ namespace OpenSim.Capabilities.Handlers
115// "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}", 114// "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
116// textureID, httpResponse.StatusCode, httpResponse.ContentLength); 115// textureID, httpResponse.StatusCode, httpResponse.ContentLength);
117 116
118 httpResponse.Send();
119 return null; 117 return null;
120 } 118 }
121 119