trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup post-migration mess

This commit is contained in:
Jens Langhammer 2019-03-21 15:02:33 +01:00
parent 10b7d99b37
commit 3a52059793
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
passbook/core/policies.py
View File

@ -3,11 +3,8 @@ from logging import getLogger
from amqp.exceptions import UnexpectedFrame from amqp.exceptions import UnexpectedFrame
from celery import group from celery import group
<<<<<<< HEAD
from celery.exceptions import TimeoutError as CeleryTimeoutError from celery.exceptions import TimeoutError as CeleryTimeoutError
=======
from django.core.cache import cache from django.core.cache import cache
>>>>>>> master
from ipware import get_client_ip from ipware import get_client_ip
from passbook.core.celery import CELERY_APP from passbook.core.celery import CELERY_APP
@ -90,7 +87,7 @@ class PolicyEngine:
else: else:
LOGGER.debug("Evaluating policy %s", policy.pk.hex) LOGGER.debug("Evaluating policy %s", policy.pk.hex)
signatures.append(_policy_engine_task.signature( signatures.append(_policy_engine_task.signature(
args=(self._user.pk, policy.pk.hex), args=(self.__user.pk, policy.pk.hex),
kwargs=kwargs, kwargs=kwargs,
time_limit=policy.timeout)) time_limit=policy.timeout))
self.__get_timeout += policy.timeout self.__get_timeout += policy.timeout
@ -111,7 +108,7 @@ class PolicyEngine:
try: try:
if self.__group: if self.__group:
# ValueError can be thrown from _policy_engine_task when user is None # ValueError can be thrown from _policy_engine_task when user is None
result += self.__group.get(timeout=self._get_timeout) result += self.__group.get(timeout=self.__get_timeout)
result += self.__cached result += self.__cached
except ValueError as exc: except ValueError as exc:
# ValueError can be thrown from _policy_engine_task when user is None # ValueError can be thrown from _policy_engine_task when user is None