aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'webmentions_ssg/tasks')
-rw-r--r--webmentions_ssg/tasks/consumer.py16
-rw-r--r--webmentions_ssg/tasks/notifications.py4
-rw-r--r--webmentions_ssg/tasks/receiver.py3
-rw-r--r--webmentions_ssg/tasks/retention.py2
-rw-r--r--webmentions_ssg/tasks/scanner.py3
-rw-r--r--webmentions_ssg/tasks/sender.py3
6 files changed, 15 insertions, 16 deletions
diff --git a/webmentions_ssg/tasks/consumer.py b/webmentions_ssg/tasks/consumer.py
index 9010ef7..047c010 100644
--- a/webmentions_ssg/tasks/consumer.py
+++ b/webmentions_ssg/tasks/consumer.py
@@ -6,7 +6,7 @@
from huey import Huey, crontab
-from .. import HUEY, create_app
+from .. import create_app, extensions
def create_consumer() -> Huey:
@@ -23,24 +23,28 @@ def create_consumer() -> Huey:
from . import notifications, receiver, retention, scanner
schedule = crontab(*app.config["SCANNER_SCHEDULE"].split(), strict=True)
- HUEY.periodic_task(schedule)(scanner.scan_sources)
+ extensions.huey.periodic_task(schedule)(scanner.scan_sources)
recovery_schedule = crontab(
*app.config["VERIFICATION_REAPER_SCHEDULE"].split(), strict=True
)
- HUEY.periodic_task(recovery_schedule)(receiver.recover_stale_webmentions)
+ extensions.huey.periodic_task(recovery_schedule)(receiver.recover_stale_webmentions)
notification_schedule = crontab(
*app.config["NOTIFICATION_SCHEDULE"].split(), strict=True
)
- HUEY.periodic_task(notification_schedule)(notifications.send_webmention_digest)
+ extensions.huey.periodic_task(notification_schedule)(
+ notifications.send_webmention_digest
+ )
retention_schedule = crontab(
*app.config["RECEIVED_RETENTION_SCHEDULE"].split(), strict=True
)
- HUEY.periodic_task(retention_schedule)(retention.purge_old_received_webmentions)
+ extensions.huey.periodic_task(retention_schedule)(
+ retention.purge_old_received_webmentions
+ )
- return HUEY.huey
+ return extensions.huey.huey
huey = create_consumer()
diff --git a/webmentions_ssg/tasks/notifications.py b/webmentions_ssg/tasks/notifications.py
index a6a9b2b..fe12e93 100644
--- a/webmentions_ssg/tasks/notifications.py
+++ b/webmentions_ssg/tasks/notifications.py
@@ -10,9 +10,7 @@ import sqlalchemy as sa
from flask import current_app
from flask_mail import Message
-from ..extensions import DATABASE as db
-from ..extensions import HUEY as huey
-from ..extensions import MAIL as mail
+from ..extensions import db, huey, mail
from ..models import ReceivedStatus, ReceivedWebmention
diff --git a/webmentions_ssg/tasks/receiver.py b/webmentions_ssg/tasks/receiver.py
index ada89f8..4c4134c 100644
--- a/webmentions_ssg/tasks/receiver.py
+++ b/webmentions_ssg/tasks/receiver.py
@@ -13,8 +13,7 @@ import sqlalchemy as sa
from flask import current_app
from .. import APP_NAME, VERSION
-from ..extensions import DATABASE as db
-from ..extensions import HUEY as huey
+from ..extensions import db, huey
from ..models import ReceivedStatus, ReceivedWebmention
from ..net import (
AddressResolutionError,
diff --git a/webmentions_ssg/tasks/retention.py b/webmentions_ssg/tasks/retention.py
index 935f54b..754c891 100644
--- a/webmentions_ssg/tasks/retention.py
+++ b/webmentions_ssg/tasks/retention.py
@@ -11,7 +11,7 @@ import sqlalchemy as sa
from flask import current_app
from sqlalchemy.engine import CursorResult
-from ..extensions import DATABASE as db
+from ..extensions import db
from ..models import ReceivedStatus, ReceivedWebmention
diff --git a/webmentions_ssg/tasks/scanner.py b/webmentions_ssg/tasks/scanner.py
index 6365ff9..353d538 100644
--- a/webmentions_ssg/tasks/scanner.py
+++ b/webmentions_ssg/tasks/scanner.py
@@ -12,8 +12,7 @@ from flask import current_app
from huey.exceptions import RetryTask, TaskLockedException
from sqlalchemy.orm import selectinload
-from ..extensions import DATABASE as db
-from ..extensions import HUEY as huey
+from ..extensions import db, huey
from ..models import SentWebmention, Source
from ..net import is_http_url
from .sender import send_webmention
diff --git a/webmentions_ssg/tasks/sender.py b/webmentions_ssg/tasks/sender.py
index 3803463..463208d 100644
--- a/webmentions_ssg/tasks/sender.py
+++ b/webmentions_ssg/tasks/sender.py
@@ -14,8 +14,7 @@ from flask import current_app
from huey.exceptions import TaskLockedException
from .. import APP_NAME, VERSION
-from ..extensions import DATABASE as db
-from ..extensions import HUEY as huey
+from ..extensions import db, huey
from ..models import SentWebmention, SentWebmentionStatus
from ..net import (
AddressResolutionError,