From e5b7e2fd40426a73296526382b4d6df22aaa6986 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 29 Nov 2011 17:26:45 +0000 Subject: [PATCH] With "debug http 1", show the path with the query string instead of just the path. Also simplifies debug levels to just 0 and 1 --- .../Servers/HttpServer/BaseHttpServer.cs | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 689a292a6e..7bd1836fcf 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -447,14 +447,12 @@ namespace OpenSim.Framework.Servers.HttpServer string path = request.RawUrl; string handlerKey = GetHandlerKey(request.HttpMethod, path); - if (DebugLevel >= 1) - m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); - if (TryGetStreamHandler(handlerKey, out requestHandler)) { - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found stream handler {0} for request to {1}", handlerKey, path); + "[BASE HTTP SERVER]: Found stream handler for {0} {1}", + request.HttpMethod, request.Url.PathAndQuery); // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. byte[] buffer = null; @@ -488,7 +486,6 @@ namespace OpenSim.Framework.Servers.HttpServer string[] querystringkeys = request.QueryString.AllKeys; string[] rHeaders = request.Headers.AllKeys; - foreach (string queryname in querystringkeys) { keysvals.Add(queryname, request.QueryString[queryname]); @@ -575,10 +572,10 @@ namespace OpenSim.Framework.Servers.HttpServer if (strAccept.Contains("application/llsd+xml") || strAccept.Contains("application/llsd+json")) { - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found an application/llsd+xml accept header for request to {0}", - path); + "[BASE HTTP SERVER]: Found application/llsd+xml accept header handler for {0} {1}", + request.HttpMethod, request.Url.PathAndQuery); HandleLLSDRequests(request, response); return; @@ -591,10 +588,10 @@ namespace OpenSim.Framework.Servers.HttpServer case null: case "text/html": - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found a {0} content type for request to {1}", - request.ContentType, path); + "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}", + request.ContentType, request.HttpMethod, request.Url.PathAndQuery); HandleHTTPRequest(request, response); return; @@ -603,10 +600,10 @@ namespace OpenSim.Framework.Servers.HttpServer case "application/xml+llsd": case "application/llsd+json": - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found a {0} content type for request to {1}", - request.ContentType, path); + "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}", + request.ContentType, request.HttpMethod, request.Url.PathAndQuery); HandleLLSDRequests(request, response); return; @@ -624,9 +621,10 @@ namespace OpenSim.Framework.Servers.HttpServer //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler"); if (DoWeHaveALLSDHandler(request.RawUrl)) { - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found an LLSD handler for request to {0}", path); + "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}", + request.ContentType, request.HttpMethod, request.Url.PathAndQuery); HandleLLSDRequests(request, response); return; @@ -635,17 +633,19 @@ namespace OpenSim.Framework.Servers.HttpServer // m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl); if (DoWeHaveAHTTPHandler(request.RawUrl)) { - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Found an HTTP handler for request to {0}", path); + "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}", + request.ContentType, request.HttpMethod, request.Url.PathAndQuery); HandleHTTPRequest(request, response); return; } - if (DebugLevel >= 2) + if (DebugLevel >= 1) m_log.DebugFormat( - "[BASE HTTP SERVER]: Treating request to {0} as a generic XMLRPC request", path); + "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}", + request.HttpMethod, request.Url.PathAndQuery); // generic login request. HandleXmlRpcRequests(request, response);