diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-02-09 18:58:36 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-02-09 18:58:36 +0000 |
| commit | f0a1633425d5afdaec85e188ce67d647e218ff23 (patch) | |
| tree | 5953ea1fab57bb42d396c7fe111db6bc58282a99 /django/middleware | |
| parent | c609b792f74948bc4e485ebfcb456ef1b6f8ce0a (diff) | |
Fixed #17358 -- Updated logging calls to use official syntax for arguments instead of string interpolation. Thanks, spulec.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/middleware')
| -rw-r--r-- | django/middleware/common.py | 2 | ||||
| -rw-r--r-- | django/middleware/csrf.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py index 4dd2e14652..aaa094d15a 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -42,7 +42,7 @@ class CommonMiddleware(object): if 'HTTP_USER_AGENT' in request.META: for user_agent_regex in settings.DISALLOWED_USER_AGENTS: if user_agent_regex.search(request.META['HTTP_USER_AGENT']): - logger.warning('Forbidden (User agent): %s' % request.path, + logger.warning('Forbidden (User agent): %s', request.path, extra={ 'status_code': 403, 'request': request diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py index 37f92b1d94..d46fc7bcd8 100644 --- a/django/middleware/csrf.py +++ b/django/middleware/csrf.py @@ -134,7 +134,7 @@ class CsrfViewMiddleware(object): # we can use strict Referer checking. referer = request.META.get('HTTP_REFERER') if referer is None: - logger.warning('Forbidden (%s): %s' % (REASON_NO_REFERER, request.path), + logger.warning('Forbidden (%s): %s', REASON_NO_REFERER, request.path, extra={ 'status_code': 403, 'request': request, @@ -146,7 +146,7 @@ class CsrfViewMiddleware(object): good_referer = 'https://%s/' % request.get_host() if not same_origin(referer, good_referer): reason = REASON_BAD_REFERER % (referer, good_referer) - logger.warning('Forbidden (%s): %s' % (reason, request.path), + logger.warning('Forbidden (%s): %s', reason, request.path, extra={ 'status_code': 403, 'request': request, @@ -158,7 +158,7 @@ class CsrfViewMiddleware(object): # No CSRF cookie. For POST requests, we insist on a CSRF cookie, # and in this way we can avoid all CSRF attacks, including login # CSRF. - logger.warning('Forbidden (%s): %s' % (REASON_NO_CSRF_COOKIE, request.path), + logger.warning('Forbidden (%s): %s', REASON_NO_CSRF_COOKIE, request.path, extra={ 'status_code': 403, 'request': request, @@ -177,7 +177,7 @@ class CsrfViewMiddleware(object): request_csrf_token = request.META.get('HTTP_X_CSRFTOKEN', '') if not constant_time_compare(request_csrf_token, csrf_token): - logger.warning('Forbidden (%s): %s' % (REASON_BAD_TOKEN, request.path), + logger.warning('Forbidden (%s): %s', REASON_BAD_TOKEN, request.path, extra={ 'status_code': 403, 'request': request, |