Move import of models inline.

Fix issue #1.
This commit is contained in:
Jannis Leidel 2017-05-08 13:00:45 +02:00
parent 60d7200f49
commit 4a628dd395
2 changed files with 15 additions and 14 deletions

View file

@ -8,10 +8,10 @@ from celery import states
from celery.events.state import Task
from celery.events.snapshot import Polaroid
from celery.five import monotonic
from celery.utils.imports import symbol_by_name
from celery.utils.log import get_logger
from celery.utils.time import maybe_iso8601
from .models import WorkerState, TaskState
from .utils import fromtimestamp, correct_awareness
WORKER_UPDATE_FREQ = 60 # limit worker timestamp write freq.
@ -24,19 +24,20 @@ debug = logger.debug
class Camera(Polaroid):
"""The Celery events Polaroid snapshot camera.
Stores task and worker state in the data models
``django_celery_monitor.models.TaskState`` and
``django_celery_monitor.models.WorkerState``.
"""
TaskState = TaskState
WorkerState = WorkerState
"""The Celery events Polaroid snapshot camera."""
clear_after = True
worker_update_freq = WORKER_UPDATE_FREQ
@property
def TaskState(self):
"""Return the data model to store task state in."""
return symbol_by_name('django_celery_monitor.models.TaskState')
@property
def WorkerState(self):
"""Return the data model to store worker state in."""
return symbol_by_name('django_celery_monitor.models.WorkerState')
def __init__(self, *args, **kwargs):
super(Camera, self).__init__(*args, **kwargs)
self._last_worker_write = defaultdict(lambda: (None, None))

View file

@ -1,7 +1,7 @@
[tox]
envlist =
py{py,27,34,35}-dj{18,19,110}
py36-dj111
tests-py{py,27,34,35}-dj{18,19,110}
tests-py36-dj111
apicheck
builddocs
flake8
@ -33,7 +33,7 @@ deps=
flake8,flakeplus,manifest,pydocstyle,readme: -r{toxinidir}/requirements/pkgutils.txt
commands =
py: py.test -xv --cov=django_celery_monitor --cov-report=term --cov-report=xml --no-cov-on-fail
tests: py.test -xv --cov=django_celery_monitor --cov-report=term --cov-report=xml --no-cov-on-fail
apicheck: sphinx-build -W -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
builddocs: sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
flake8: flake8 {toxinidir}/django_celery_monitor {toxinidir}/tests