mirror of
https://github.com/jazzband/django-axes.git
synced 2026-05-04 13:44:46 +00:00
Clean up logging initialization
Signed-off-by: Aleksi Häkli <aleksi.hakli@iki.fi>
This commit is contained in:
parent
84ff56e8b1
commit
502434bbcb
2 changed files with 36 additions and 14 deletions
36
axes/apps.py
36
axes/apps.py
|
|
@ -1,9 +1,45 @@
|
|||
import logging
|
||||
|
||||
from django import apps
|
||||
|
||||
from axes import get_version
|
||||
from axes.conf import settings
|
||||
|
||||
log = logging.getLogger(settings.AXES_LOGGER)
|
||||
|
||||
|
||||
class AppConfig(apps.AppConfig):
|
||||
name = 'axes'
|
||||
logging_initialized = False
|
||||
|
||||
@classmethod
|
||||
def log(cls):
|
||||
"""
|
||||
Initialize Axes logging and show version information.
|
||||
|
||||
This method is re-entrant and can be called multiple times.
|
||||
It displays version information exactly once at application startup.
|
||||
"""
|
||||
|
||||
if cls.logging_initialized:
|
||||
return
|
||||
cls.logging_initialized = True
|
||||
|
||||
if not settings.AXES_VERBOSE:
|
||||
return
|
||||
|
||||
log.info('AXES: BEGIN LOG')
|
||||
log.info('AXES: Using django-axes %s', get_version())
|
||||
|
||||
if settings.AXES_ONLY_USER_FAILURES:
|
||||
log.info('AXES: blocking by username only.')
|
||||
elif settings.AXES_LOCK_OUT_BY_COMBINATION_USER_AND_IP:
|
||||
log.info('AXES: blocking by combination of username and IP.')
|
||||
else:
|
||||
log.info('AXES: blocking by IP only.')
|
||||
|
||||
def ready(self):
|
||||
self.log()
|
||||
|
||||
from axes import signals
|
||||
signals.ProxyHandler.initialize()
|
||||
|
|
|
|||
|
|
@ -1,22 +1,8 @@
|
|||
from functools import wraps
|
||||
import logging
|
||||
|
||||
from axes import get_version
|
||||
from axes.conf import settings
|
||||
from axes.attempts import is_already_locked
|
||||
from axes.utils import get_lockout_response
|
||||
|
||||
log = logging.getLogger(settings.AXES_LOGGER)
|
||||
if settings.AXES_VERBOSE:
|
||||
log.info('AXES: BEGIN LOG')
|
||||
log.info('AXES: Using django-axes %s', get_version())
|
||||
if settings.AXES_ONLY_USER_FAILURES:
|
||||
log.info('AXES: blocking by username only.')
|
||||
elif settings.AXES_LOCK_OUT_BY_COMBINATION_USER_AND_IP:
|
||||
log.info('AXES: blocking by combination of username and IP.')
|
||||
else:
|
||||
log.info('AXES: blocking by IP only.')
|
||||
|
||||
|
||||
def axes_dispatch(func):
|
||||
def inner(request, *args, **kwargs):
|
||||
|
|
|
|||
Loading…
Reference in a new issue