diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index 0b4ff7bd3..3a0969e5d 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -19,13 +19,3 @@ app.config_from_object("django.conf:settings", namespace="CELERY") # Load task modules from all registered Django app configs. app.autodiscover_tasks() -app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity") -app.autodiscover_tasks(["bookwyrm"], related_name="activitystreams") -app.autodiscover_tasks(["bookwyrm"], related_name="broadcast") -app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector") -app.autodiscover_tasks(["bookwyrm"], related_name="emailing") -app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import") -app.autodiscover_tasks(["bookwyrm"], related_name="preview_images") -app.autodiscover_tasks(["bookwyrm"], related_name="models.user") -app.autodiscover_tasks(["bookwyrm"], related_name="suggested_users") -app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox") diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index 48d134468..55af4ce4d 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -10,21 +10,7 @@ CELERY_RESULT_BACKEND = "redis://:{}@redis_broker:{}/0".format( requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT") ) -CELERY_TASK_ROUTES = ([ - # high - should really happen ASAP - ("bookwyrm.emailing.*", {"queue": "high_priority"}), - # medium - should really happen - ("bookwyrm.activitypub.base_activity.*", {"queue": "medium_priority"}), - ("bookwyrm.views.inbox.*", {"queue": "medium_priority"}), - ("bookwyrm.broadcast.*", {"queue": "medium_priority"}), - ("bookwyrm.activitystreams.*", {"queue": "medium_priority"}), - # low - no rush - ("bookwyrm.connectors.abstract_connector.*", {"queue": "low_priority"}), - ("bookwyrm.goodreads_import.*", {"queue": "low_priority"}), - ("bookwyrm.models.user.*", {"queue": "low_priority"}), - ("bookwyrm.suggested_users.*", {"queue": "low_priority"}), - ("bookwyrm.preview_images.*", {"queue": "low_priority"}), -]) +CELERY_DEFAULT_QUEUE="low_priority" CELERY_ACCEPT_CONTENT = ["json"] CELERY_TASK_SERIALIZER = "json"