Merge remote-tracking branch 'origin/1.0.x'

This commit is contained in:
David Lord 2019-06-01 06:53:29 -07:00
commit 65b453b692

View file

@ -117,14 +117,19 @@ your own fields that can be used in messages. You can change the formatter for
Flask's default handler, the mail handler defined above, or any other Flask's default handler, the mail handler defined above, or any other
handler. :: handler. ::
from flask import request from flask import has_request_context, request
from flask.logging import default_handler from flask.logging import default_handler
class RequestFormatter(logging.Formatter): class RequestFormatter(logging.Formatter):
def format(self, record): def format(self, record):
record.url = request.url if has_request_context():
record.remote_addr = request.remote_addr record.url = request.url
return super(RequestFormatter, self).format(record) record.remote_addr = request.remote_addr
else:
record.url = None
record.remote_addr = None
return super().format(record)
formatter = RequestFormatter( formatter = RequestFormatter(
'[%(asctime)s] %(remote_addr)s requested %(url)s\n' '[%(asctime)s] %(remote_addr)s requested %(url)s\n'