tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved request logging

Browse Source
This commit is contained in:
Peter Bieringer 2016-09-17 15:35:43 +02:00
parent 0c1dbc30bd
commit d116423458
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
radicale/__init__.py
View File

@ -40,6 +40,7 @@ import threading
import urllib import urllib
import wsgiref.simple_server import wsgiref.simple_server
import zlib import zlib
import datetime
from http import client from http import client
from urllib.parse import unquote, urlparse from urllib.parse import unquote, urlparse
@ -295,15 +296,28 @@ class Application:
headers[key] = self.configuration.get("headers", key) headers[key] = self.configuration.get("headers", key)
# Start response # Start response
time_end = datetime.datetime.now()
status = "%i %s" % ( status = "%i %s" % (
status, client.responses.get(status, "Unknown")) status, client.responses.get(status, "Unknown"))
self.logger.debug("Answer status: %s", status) self.logger.info("%s answer status for %s in %s sec: %s", environ["REQUEST_METHOD"], environ["PATH_INFO"], (time_end - time_begin).total_seconds(), status)
start_response(status, list(headers.items())) start_response(status, list(headers.items()))
# Return response content # Return response content
return [answer] if answer else [] return [answer] if answer else []
self.logger.info("%s request at %s received", remote_host = "unkown"
environ["REQUEST_METHOD"], environ["PATH_INFO"]) if "REMOTE_HOST" in environ:
if environ["REMOTE_HOST"]:
remote_host = environ["REMOTE_HOST"]
if "HTTP_X_FORWARDED_FOR" in environ:
if environ["HTTP_X_FORWARDED_FOR"]:
remote_host = environ["HTTP_X_FORWARDED_FOR"]
remote_useragent = "[-no-user-agent-provided-]"
if "HTTP_USER_AGENT" in environ:
if environ["HTTP_USER_AGENT"]:
remote_useragent = environ["HTTP_USER_AGENT"]
time_begin = datetime.datetime.now()
self.logger.info("%s request for %s received from %s using \"%s\"",
environ["REQUEST_METHOD"], environ["PATH_INFO"], remote_host, remote_useragent)
headers = pprint.pformat(self.headers_log(environ)) headers = pprint.pformat(self.headers_log(environ))
self.logger.debug("Request headers:\n%s", headers) self.logger.debug("Request headers:\n%s", headers)