Migrate from rq-scheduler to new built-in CronScheduler (#435)

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

dejacode/settings.py

@@ -566,11 +566,6 @@ def get_fake_redis_connection(config, use_strict_redis):
             "propagate": False,
             "level": DEJACODE_LOG_LEVEL,
         },
-        "rq_scheduler.scheduler": {
-            "handlers": ["null"] if IS_TESTS else ["console"],
-            "propagate": False,
-            "level": "DEBUG" if DEBUG else DEJACODE_LOG_LEVEL,
-        },
     },
 }
 

dje/cron_jobs.py

@@ -0,0 +1,22 @@
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# DejaCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
+# See https://github.com/aboutcode-org/dejacode for support or download.
+# See https://aboutcode.org for more information about AboutCode FOSS projects.
+#
+
+from django.conf import settings
+
+from rq import cron
+
+from dje.tasks import update_vulnerabilities
+
+two_hour = 7200
+
+cron.register(
+    func=update_vulnerabilities,
+    queue_name="default",
+    cron=settings.DEJACODE_VULNERABILITIES_CRON,  # Daily at 3am by default
+    job_timeout=two_hour,
+)

dje/management/commands/setupcron.py

@@ -122,7 +122,7 @@ def scancodeio_submit_scan(uris, user_uuid, dataspace_uuid):
             scancodeio.submit_scan(uri, user_uuid, dataspace_uuid)
 
 
-@job("default", timeout="3h")
+@job("default", timeout=7200)
 def update_vulnerabilities():
     """Fetch vulnerabilities for all Dataspaces that enable vulnerablecodedb access."""
     from vulnerabilities.fetch import fetch_from_vulnerablecode
@@ -133,4 +133,10 @@ def update_vulnerabilities():
 
     for dataspace in dataspace_qs:
         logger.info(f"fetch_vulnerabilities for datapsace={dataspace}")
-        fetch_from_vulnerablecode(dataspace, batch_size=50, update=True, timeout=60)
+        fetch_from_vulnerablecode(
+            dataspace,
+            batch_size=50,
+            update=True,
+            timeout=60,
+            log_func=logger.debug,
+        )

dje/tasks.py

@@ -66,9 +66,7 @@ services:
 
   scheduler:
     build: .
-    command: wait-for-it web:8000 -- sh -c "
-      ./manage.py setupcron &&
-      ./manage.py rqscheduler --interval=600"
+    command: wait-for-it web:8000 -- sh -c "./manage.py rqcron dje.cron_jobs"
     env_file:
       - docker.env
     volumes:

docker-compose.yml

@@ -80,14 +80,10 @@ dependencies = [
     # Testing
     "model_bakery==1.10.1",
     # Task queue
-    "rq==2.6.0",
+    "rq==2.6.1",
     "croniter==6.0.0",
-    "django-rq==3.1.0",
+    "django-rq==3.2.1",
     "fakeredis==2.32.1",
-    # Scheduler
-    "rq-scheduler==0.14.0",
-    "crontab==1.0.5",
-    "freezegun==1.5.2",
     # Libs
     "certifi==2025.11.12",
     "urllib3==2.5.0",

pyproject.toml

@@ -0,0 +1,17 @@
+about_resource: django_rq-3.2.1-py3-none-any.whl
+name: django-rq
+version: 3.2.1
+download_url: https://files.pythonhosted.org/packages/77/e1/c74a380907406146785131ccbe695b995161ba3ce899dbd8a54a7cd71d4b/django_rq-3.2.1-py3-none-any.whl
+package_url: pkg:pypi/django-rq@3.2.1
+license_expression: mit AND unknown-license-reference
+copyright: Copyright django-rq project contributors
+attribute: yes
+checksum_md5: 28eaea8cbf65da895741cf7eb251d391
+checksum_sha1: 2ecbe1c28f5d08b328aa33cda2bac499507539bb
+licenses:
+  - key: mit
+    name: MIT License
+    file: mit.LICENSE
+  - key: unknown-license-reference
+    name: Unknown License file reference
+    file: unknown-license-reference.LICENSE