OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

attempting to get to the bottom of unresponsive grids servers by 

adding back in a few messages on exceptions.
0.6.0-stable
Sean Dague 2008-05-29 15:01:26 +00:00
parent a84456c239
commit 22c7845e0c
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -84,10 +84,12 @@ namespace OpenSim.Framework.Servers
string handlerKey = GetHandlerKey(httpMethod, path); string handlerKey = GetHandlerKey(httpMethod, path);
if (!m_streamHandlers.ContainsKey(handlerKey)) lock(m_streamHandlers) {
{ if (!m_streamHandlers.ContainsKey(handlerKey))
//m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); {
m_streamHandlers.Add(handlerKey, handler); //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
m_streamHandlers.Add(handlerKey, handler);
}
} }
} }
@ -98,10 +100,12 @@ namespace OpenSim.Framework.Servers
public bool AddXmlRPCHandler(string method, XmlRpcMethod handler) public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
{ {
if (!m_rpcHandlers.ContainsKey(method)) lock(m_rpcHandlers) {
{ if (!m_rpcHandlers.ContainsKey(method))
m_rpcHandlers.Add(method, handler); {
return true; m_rpcHandlers.Add(method, handler);
return true;
}
} }
//must already have a handler for that path so return false //must already have a handler for that path so return false
@ -110,10 +114,12 @@ namespace OpenSim.Framework.Servers
public bool AddHTTPHandler(string method, GenericHTTPMethod handler) public bool AddHTTPHandler(string method, GenericHTTPMethod handler)
{ {
if (!m_HTTPHandlers.ContainsKey(method)) lock(m_HTTPHandlers) {
{ if (!m_HTTPHandlers.ContainsKey(method))
m_HTTPHandlers.Add(method, handler); {
return true; m_HTTPHandlers.Add(method, handler);
return true;
}
} }
//must already have a handler for that path so return false //must already have a handler for that path so return false
@ -126,10 +132,12 @@ namespace OpenSim.Framework.Servers
public bool AddAgentHandler(string agent, IHttpAgentHandler handler) public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
{ {
if (!m_agentHandlers.ContainsKey(agent)) lock(m_agentHandlers) {
{ if (!m_agentHandlers.ContainsKey(agent))
m_agentHandlers.Add(agent, handler); {
return true; m_agentHandlers.Add(agent, handler);
return true;
}
} }
//must already have a handler for that path so return false //must already have a handler for that path so return false
@ -156,16 +164,17 @@ namespace OpenSim.Framework.Servers
OSHttpRequest request = new OSHttpRequest(context.Request); OSHttpRequest request = new OSHttpRequest(context.Request);
OSHttpResponse response = new OSHttpResponse(context.Response); OSHttpResponse response = new OSHttpResponse(context.Response);
// user agent based requests? not sure where this actually gets used from
if (request.UserAgent != null) if (request.UserAgent != null)
{ {
IHttpAgentHandler agentHandler; IHttpAgentHandler agentHandler;
if (TryGetAgentHandler(request, response, out agentHandler)) if (TryGetAgentHandler(request, response, out agentHandler))
{ {
// m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent); if (HandleAgentRequest(agentHandler, request, response)) {
if (HandleAgentRequest(agentHandler, request, response)) m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent);
return; return;
}
} }
} }
@ -235,7 +244,7 @@ namespace OpenSim.Framework.Servers
return; return;
} }
} }
catch (SocketException) catch (SocketException e)
{ {
// At least on linux, it appears that if the client makes a request without requiring the response, // At least on linux, it appears that if the client makes a request without requiring the response,
// an unconnected socket exception is thrown when we close the response output stream. There's no // an unconnected socket exception is thrown when we close the response output stream. There's no
@ -244,6 +253,7 @@ namespace OpenSim.Framework.Servers
// //
// An alternative may be to turn off all response write exceptions on the HttpListener, but let's go // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
// with the minimum first // with the minimum first
m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
} }
catch (Exception e) catch (Exception e)
{ {
@ -403,9 +413,10 @@ namespace OpenSim.Framework.Servers
{ {
response.OutputStream.Close(); response.OutputStream.Close();
} }
catch (SocketException) catch (SocketException e)
{ {
// This has to be here to prevent a Linux/Mono crash // This has to be here to prevent a Linux/Mono crash
m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
} }
} }
} }