build: run huey consumer as a runit deamon in the server service

this is considerably easier to manage than creating a clone service, not
sure if there is any potential downside to not isolating the two
processes

base.yml

@@ -85,32 +85,6 @@ services:
         condition: service_started
     env_file:
       - ./.env
-  huey:
-    build: django
-    image: comses/huey
-    secrets:
-      - db_password
-      - discourse_api_key
-      - discourse_sso_secret
-      - django_secret_key
-      - github_client_secret
-      - orcid_client_secret
-      - github_app_private_key
-      - github_app_client_secret
-      - hcaptcha_secret
-      - mail_api_key
-    volumes:
-      - ./deploy/elasticsearch.conf.d:/etc/elasticsearch
-      - ./docker/shared:/shared
-      - ./.env:/etc/environment
-    command: ["/code/manage.py", "run_huey"]
-    depends_on:
-      server:
-        condition: service_started
-      redis:
-        condition: service_started
-    env_file:
-      - ./.env
 
 secrets:
   db_password:

dev.yml

@@ -21,12 +21,3 @@ services:
       DJANGO_SETTINGS_MODULE: "core.settings.dev"
     ports:
       - "127.0.0.1:8000:8000"
-  huey:
-    build:
-      args:
-        UBUNTU_MIRROR: "${UBUNTU_MIRROR}"
-    image: comses/huey:dev
-    volumes:
-      - ./django:/code
-    environment:
-      DJANGO_SETTINGS_MODULE: "core.settings.dev"

django/Dockerfile

@@ -40,9 +40,9 @@ RUN --mount=type=cache,target=/var/lib/apt,sharing=locked \
         unzip \
         && update-alternatives --install /usr/bin/python python /usr/bin/python3 1000 \
         && apt-get upgrade -y -o Dpkg::Options::="--force-confold" \
-        && mkdir -p /etc/service/django \
-        && touch /etc/service/django/run /etc/postgresql-backup-pre \
-        && chmod a+x /etc/service/django/run /etc/postgresql-backup-pre \
+        && mkdir -p /etc/service/django /etc/service/huey \
+        && touch /etc/service/django/run /etc/service/huey/run /etc/postgresql-backup-pre \
+        && chmod a+x /etc/service/django/run /etc/service/huey/run /etc/postgresql-backup-pre \
         && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /code
@@ -58,5 +58,6 @@ COPY ./deploy/cron.weekly/* /etc/cron.weekly/
 COPY ./deploy/db/autopostgresqlbackup.conf /etc/default/autopostgresqlbackup
 COPY ./deploy/db/postgresql-backup-pre /etc/
 COPY ${RUN_SCRIPT} /etc/service/django/run
+COPY ./deploy/huey.sh /etc/service/huey/run
 COPY . /code
 CMD ["/sbin/my_init"]

django/core/settings/defaults.py

@@ -392,7 +392,7 @@ def is_test(self):
             "level": "INFO",
             "handlers": ["console", "comsesfile"],
             "propagate": False,
-        },  # FIXME: change this in prod
+        },
     },
 }
 
@@ -485,6 +485,7 @@ def is_test(self):
     "name": "comses",
     "huey_class": "core.huey.DjangoRedisHuey",
     "immediate": False,  # always run tasks in the background, even in dev (for now)
+    # if removed here, it will default to DEBUG
 }
 
 # SSO, user registration, and django-allauth configuration, see

django/core/settings/staging.py

@@ -177,5 +177,10 @@
             "handlers": ["comsesfile"],
             "propagate": False,
         },
+        "huey": {
+            "level": "WARNING",
+            "handlers": ["comsesfile"],
+            "propagate": False,
+        },
     },
 }

django/deploy/huey.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /code/manage.py run_huey