Merge pull request #47 from OutboundSpade/main

Add database connection pooling

Author: OutboundSpade

config/settings/base.py

@@ -46,6 +46,8 @@
     "default": env.db("DATABASE_URL", default="postgres:///teleband"),
 }
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
+DATABASES["default"]["OPTIONS"] = {"pool": True}
+
 # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 

config/settings/local.py

@@ -14,7 +14,16 @@
     "default": env.db("DATABASE_URL", default="sqlite:///db.sqlite"),
 }
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["localhost", "0.0.0.0", "127.0.0.1", "dev-api.musiccpr.org", "api.musiccpr.org"])
+ALLOWED_HOSTS = env.list(
+    "ALLOWED_HOSTS",
+    default=[
+        "localhost",
+        "0.0.0.0",
+        "127.0.0.1",
+        "dev-api.musiccpr.org",
+        "api.musiccpr.org",
+    ],
+)
 
 # CACHES
 # ------------------------------------------------------------------------------

config/settings/production.py

@@ -7,7 +7,10 @@
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 SECRET_KEY = env("DJANGO_SECRET_KEY")
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["https://tele.band", "dev-api.musiccpr.org", "api.musiccpr.org"])
+ALLOWED_HOSTS = env.list(
+    "DJANGO_ALLOWED_HOSTS",
+    default=["https://tele.band", "dev-api.musiccpr.org", "api.musiccpr.org"],
+)
 
 # DATABASES
 # ------------------------------------------------------------------------------

requirements/local.txt

@@ -2,7 +2,7 @@
 
 Werkzeug==3.0.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.13 # https://github.com/gotcha/ipdb
-psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
+psycopg[binary]>=3.0.0 # https://github.com/psycopg/psycopg
 watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod
 
 # Testing

requirements/production.txt

@@ -4,7 +4,7 @@
 
 wheel==0.43.0 # https://idk
 gunicorn==22.0.0 # https://github.com/benoitc/gunicorn
-psycopg2-binary==2.9.9 # https://github.com/psycopg/psycopg2
+psycopg[binary]>=3.0.0 # https://github.com/psycopg/psycopg
 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
 
 boto3==1.34.145