Merge branch 'master' into subdomains-to-query-paths

Author: jchristgit

.flake8

@@ -3,7 +3,7 @@ max-line-length=100
 docstring-convention=all
 import-order-style=pycharm
 application_import_names=pydis_site
-exclude=__pycache__, venv, .venv, **/migrations/**, .cache/
+exclude=__pycache__, venv, .venv, **/migrations/**, .cache/, gunicorn.conf.py
 ignore=
     B311,W503,E226,S311,T000
     # Missing Docstrings

.github/workflows/deploy.yaml

@@ -41,7 +41,7 @@ jobs:
         uses: Azure/k8s-deploy@v1
         with:
           manifests: |
-              site/deployment.yaml
+              namespaces/default/site/deployment.yaml
           images: 'ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}'
           kubectl-version: 'latest'
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.5-slim-buster
+FROM --platform=linux/amd64 python:3.9-slim-buster
 
 # Allow service to handle stops gracefully
 STOPSIGNAL SIGQUIT
@@ -26,6 +26,11 @@ COPY . .
 
 # Set dummy variables so collectstatic can load settings.py
 RUN \
+    # Set BUILDING_DOCKER to anything but undefined so settings.py
+    # does not insert django_prometheus into the list of installed apps.
+    # This prevents django_prometheus from attempting to connect to the database
+    # when the collectstatic task is ran.
+    BUILDING_DOCKER=yes \
     SECRET_KEY=dummy_value \
     DATABASE_URL=postgres://localhost \
     METRICITY_DB_URL=postgres://localhost \

docker-compose.yml

@@ -18,6 +18,11 @@ services:
       POSTGRES_DB: pysite
       POSTGRES_PASSWORD: pysite
       POSTGRES_USER: pysite
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U pysite"]
+      interval: 2s
+      timeout: 1s
+      retries: 5
     volumes:
       - ./postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
 
@@ -35,7 +40,8 @@ services:
     ports:
       - "127.0.0.1:8000:8000"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     tty: true
     volumes:
       - .:/app:ro

gunicorn.conf.py

@@ -0,0 +1,10 @@
+"""
+Configuration file for gunicorn.
+
+Code taken from https://github.com/prometheus/client_python#multiprocess-mode-eg-gunicorn
+"""
+from prometheus_client import multiprocess
+
+
+def child_exit(server, worker) -> None:
+    multiprocess.mark_process_dead(worker.pid)

manage.py

@@ -1,10 +1,6 @@
 #!/usr/bin/env python
 import os
-import re
-import socket
 import sys
-import time
-from typing import List
 
 import django
 from django.contrib.auth import get_user_model
@@ -42,7 +38,7 @@ class SiteManager:
         --verbose  Sets verbose console output.
     """
 
-    def __init__(self, args: List[str]):
+    def __init__(self, args: list[str]):
         self.debug = "--debug" in args
         self.silent = "--silent" in args
 
@@ -84,38 +80,6 @@ def create_superuser() -> None:
         else:
             print(f"Existing bot token found: {token}")
 
-    @staticmethod
-    def wait_for_postgres() -> None:
-        """Wait for the PostgreSQL database specified in DATABASE_URL."""
-        print("Waiting for PostgreSQL database.")
-
-        # Get database URL based on environmental variable passed in compose
-        database_url = os.environ["DATABASE_URL"]
-        match = re.search(r"@([\w.]+):(\d+)/", database_url)
-        if not match:
-            raise OSError("Valid DATABASE_URL environmental variable not found.")
-        domain = match.group(1)
-        port = int(match.group(2))
-
-        # Attempt to connect to the database socket
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-
-        attempts_left = 10
-        while attempts_left:
-            try:
-                # Ignore 'incomplete startup packet'
-                s.connect((domain, port))
-                s.shutdown(socket.SHUT_RDWR)
-                print("Database is ready.")
-                break
-            except socket.error:
-                attempts_left -= 1
-                print("Not ready yet, retrying.")
-                time.sleep(0.5)
-        else:
-            print("Database could not be found, exiting.")
-            sys.exit(1)
-
     @staticmethod
     def set_dev_site_name() -> None:
         """Set the development site domain in admin from default example."""
@@ -133,9 +97,6 @@ def prepare_server(self) -> None:
         """Perform preparation tasks before running the server."""
         django.setup()
 
-        if self.debug:
-            self.wait_for_postgres()
-
         print("Applying migrations.")
         call_command("migrate", verbosity=self.verbosity)
 
@@ -176,12 +137,10 @@ def run_server(self) -> None:
             "--preload",
             "-b", "0.0.0.0:8000",
             "pydis_site.wsgi:application",
-            "--threads", "8",
             "-w", "2",
-            "--max-requests", "1000",
-            "--max-requests-jitter", "50",
             "--statsd-host", "graphite.default.svc.cluster.local:8125",
             "--statsd-prefix", "site",
+            "--config", "file:gunicorn.conf.py"
         ]
 
         # Run gunicorn for the production server.