fix: worker timeout

.github/workflows/demo.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: demo-group
     env:
-      DEMO_BACKEND_VERSION: "v2.5.2-dev"
+      DEMO_BACKEND_VERSION: "v2.5.3-dev"
       FRONTEND_URL: "https://galv-demo.fly.dev"
       FLY_DEMO_NAME: "galv-demo-backend"
       FLY_DEMO_DB_NAME: "galv-demo-db"

backend_django/config/settings_base.py

@@ -20,7 +20,7 @@
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 import os
 
-API_VERSION = "2.5.2-dev"
+API_VERSION = "2.5.3-dev"
 
 try:
     USER_ACTIVATION_TOKEN_EXPIRY_S = int(

docs/source/conf.py

@@ -11,7 +11,7 @@
 project = "Galv"
 copyright = "2023, Oxford RSE"
 author = "Oxford RSE"
-release = "2.5.2-dev"
+release = "2.5.3-dev"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/tags.json

@@ -1 +1 @@
-["v2.2.0", "v2.3.1", "v2.5.2-dev", "main"]
+["v2.2.0", "v2.3.1", "v2.5.3-dev", "main"]

fly.demo.toml

@@ -38,6 +38,7 @@ console_command = "/code/backend_django/manage.py shell"
   DJANGO_DEFAULT_FROM_EMAIL = '[email protected]'
   DJANGO_LAB_STORAGE_QUOTA_BYTES = "10_000_000_000"  # 10GB
   DJANGO_LOG_LEVEL = "DEBUG"
+  WORKERS_PER_CORE = "1"
 
 [http_service]
   internal_port = 80

server.sh

@@ -5,15 +5,17 @@
 
 set -e
 
+WORKERS_PER_CORE = ${WORKERS_PER_CORE:-2}
+WORKERS = ${WORKERS:-$(nproc * WORKERS_PER_CORE)}
+TIMEOUT = ${TIMEOUT:-60}
+
 # Wrap the user's command to run prematter first
 # The prematter relies on envvars, so can't be run at build time
 
 if [ -z "$1" ]; then
     # No custom command provided, so run the default
     # Determine the number of workers from number of cores * 4
-    WORKERS=$(nproc)
-    WORKERS=$((WORKERS * 1))
-    COMMAND="gunicorn --bind localhost:8000 --workers $WORKERS config.wsgi"
+    COMMAND="gunicorn --bind localhost:8000 --workers $WORKERS --timeout $TIMEOUT config.wsgi"
     MESSAGE="Starting server: $COMMAND"
 else
     COMMAND="$@"