root(minor): cleanup, remove unused log

This commit is contained in:
Langhammer, Jens 2019-10-04 13:43:47 +02:00
parent 1169db7530
commit e59c4ec1c7
3 changed files with 3 additions and 44 deletions

View File

@ -61,10 +61,13 @@ class AuthenticationView(UserPassesTestMixin, View):
_all_factors = Factor.objects.filter(enabled=True).order_by('order').select_subclasses() _all_factors = Factor.objects.filter(enabled=True).order_by('order').select_subclasses()
pending_factors = [] pending_factors = []
for factor in _all_factors: for factor in _all_factors:
LOGGER.debug("Checking if factor applies to user",
factor=factor, user=self.pending_user)
policy_engine = PolicyEngine(factor.policies.all()) policy_engine = PolicyEngine(factor.policies.all())
policy_engine.for_user(self.pending_user).with_request(self.request).build() policy_engine.for_user(self.pending_user).with_request(self.request).build()
if policy_engine.passing: if policy_engine.passing:
pending_factors.append((factor.uuid.hex, factor.type)) pending_factors.append((factor.uuid.hex, factor.type))
LOGGER.debug("Factor applies", factor=factor, user=self.pending_user)
return pending_factors return pending_factors
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):

View File

@ -1,37 +0,0 @@
"""QueueListener that can be configured from logging.dictConfig"""
from atexit import register
from logging.config import ConvertingList
from logging.handlers import QueueHandler, QueueListener
from queue import Queue
def _resolve_handlers(_list):
"""Evaluates ConvertingList by iterating over it"""
if not isinstance(_list, ConvertingList):
return _list
# Indexing the list performs the evaluation.
return [_list[i] for i in range(len(_list))]
class QueueListenerHandler(QueueHandler):
"""QueueListener that can be configured from logging.dictConfig"""
def __init__(self, handlers, auto_run=True, queue=Queue(-1)):
super().__init__(queue)
handlers = _resolve_handlers(handlers)
self._listener = QueueListener(
self.queue,
*handlers,
respect_handler_level=True)
if auto_run:
self.start()
register(self.stop)
def start(self):
"""start background thread"""
self._listener.start()
def stop(self):
"""stop background thread"""
self._listener.stop()

View File

@ -268,13 +268,6 @@ with CONFIG.cd('log'):
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': "colored" if DEBUG else "plain", 'formatter': "colored" if DEBUG else "plain",
}, },
'queue': {
'level': DEBUG,
'class': 'passbook.lib.log.QueueListenerHandler',
'handlers': [
'cfg://handlers.console',
],
}
}, },
'loggers': { 'loggers': {
} }