Prepare code for merge

Signed-off-by: tdruez <[email protected]>

Author: tdruez

dje/cron_jobs.py

@@ -6,14 +6,17 @@
 # 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,  # 3am daily by default
-    cron="0 * * * *",  # Every hour
-    job_timeout=3600,  # 1 hour
+    cron=settings.DEJACODE_VULNERABILITIES_CRON,  # Daily at 3am by default
+    job_timeout=two_hour,
 )

dje/tasks.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=3600)
+@job("default", timeout=7200)
 def update_vulnerabilities():
     """Fetch vulnerabilities for all Dataspaces that enable vulnerablecodedb access."""
     from vulnerabilities.fetch import fetch_from_vulnerablecode
@@ -138,5 +138,5 @@ def update_vulnerabilities():
             batch_size=50,
             update=True,
             timeout=60,
-            log_func=logger.info,
+            log_func=logger.debug,
         )

docker-compose.yml

@@ -66,7 +66,7 @@ services:
 
   scheduler:
     build: .
-    command: wait-for-it web:8000 -- sh -c "./manage.py rqcron dje.cron_jobs --logging-level DEBUG"
+    command: wait-for-it web:8000 -- sh -c "./manage.py rqcron dje.cron_jobs"
     env_file:
       - docker.env
     volumes:

vulnerabilities/fetch.py

@@ -58,7 +58,7 @@ def fetch_from_vulnerablecode(dataspace, batch_size, update, timeout, log_func=N
 
     dataspace.vulnerabilities_updated_at = timezone.now()
     dataspace.save(update_fields=["vulnerabilities_updated_at"])
-    log_func(f"Dataspace.vulnerabilities_updated_at updated")
+    log_func("Dataspace.vulnerabilities_updated_at updated")
 
 
 def fetch_for_packages(