mirror of
https://github.com/jupyter/notebook.git
synced 2024-12-27 04:20:22 +08:00
adjustments to notebook app logging
Mainly add a log_request function (from nbviewer) for formatting tornado access logs. Relevant effects: - demote successful access logs to DEBUG - demote kernel connect messages to DEBUG which reduces the noise at INFO-level (default)
This commit is contained in:
parent
0ec0534ce9
commit
c2cb64c9a0
52
IPython/html/log.py
Normal file
52
IPython/html/log.py
Normal file
@ -0,0 +1,52 @@
|
||||
#-----------------------------------------------------------------------------
|
||||
# Copyright (C) 2013 The IPython Development Team
|
||||
#
|
||||
# Distributed under the terms of the BSD License. The full license is in
|
||||
# the file COPYING, distributed as part of this software.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
import json
|
||||
from tornado.log import access_log
|
||||
|
||||
def log_request(handler):
|
||||
"""log a bit more information about each request than tornado's default
|
||||
|
||||
- move static file get success to debug-level (reduces noise)
|
||||
- get proxied IP instead of proxy IP
|
||||
- log referer for redirect and failed requests
|
||||
- log user-agent for failed requests
|
||||
"""
|
||||
status = handler.get_status()
|
||||
request = handler.request
|
||||
if status < 300 or status == 304:
|
||||
# Successes (or 304 FOUND) are debug-level
|
||||
log_method = access_log.debug
|
||||
elif status < 400:
|
||||
log_method = access_log.info
|
||||
elif status < 500:
|
||||
log_method = access_log.warning
|
||||
else:
|
||||
log_method = access_log.error
|
||||
|
||||
request_time = 1000.0 * handler.request.request_time()
|
||||
ns = dict(
|
||||
status=status,
|
||||
method=request.method,
|
||||
ip=request.remote_ip,
|
||||
uri=request.uri,
|
||||
request_time=request_time,
|
||||
)
|
||||
msg = "{status} {method} {uri} ({ip}) {request_time:.2f}ms"
|
||||
if status >= 300:
|
||||
# log referers on redirects
|
||||
ns['referer'] = request.headers.get('Referer', 'None')
|
||||
msg = msg + ' referer={referer}'
|
||||
if status >= 400:
|
||||
# log user agent for failed requests
|
||||
ns['agent'] = request.headers.get('User-Agent', 'Unknown')
|
||||
msg = msg + ' user-agent={agent}'
|
||||
if status >= 500 and status != 502:
|
||||
# log all headers if it caused an error
|
||||
log_method(json.dumps(request.headers, indent=2))
|
||||
log_method(msg.format(**ns))
|
||||
|
@ -64,7 +64,7 @@ from tornado import web
|
||||
# Our own libraries
|
||||
from IPython.html import DEFAULT_STATIC_FILES_PATH
|
||||
from .base.handlers import Template404
|
||||
|
||||
from .log import log_request
|
||||
from .services.kernels.kernelmanager import MappingKernelManager
|
||||
from .services.notebooks.nbmanager import NotebookManager
|
||||
from .services.notebooks.filenbmanager import FileNotebookManager
|
||||
@ -158,6 +158,7 @@ class NotebookWebApplication(web.Application):
|
||||
template_path = settings_overrides.get("template_path", os.path.join(os.path.dirname(__file__), "templates"))
|
||||
settings = dict(
|
||||
# basics
|
||||
log_function=log_request,
|
||||
base_project_url=base_project_url,
|
||||
base_kernel_url=ipython_app.base_kernel_url,
|
||||
template_path=template_path,
|
||||
|
Loading…
Reference in New Issue
Block a user