updates psycopg, adds db connection pooling

mrmegatelo · Jan 20, 2025 · c832790 · c832790
1 parent 173bad1
commit c832790
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 81 deletions.
diff --git a/infra/local/django/entrypoint b/infra/local/django/entrypoint
@@ -11,17 +11,17 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname="${SQL_DATABASE}",
         user="${SQL_USER}",
         password="${SQL_PASSWORD}",
         host="${SQL_HOST}",
         port="${SQL_PORT}",
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

diff --git a/infra/production/django/entrypoint b/infra/production/django/entrypoint
@@ -8,17 +8,17 @@ postgres_ready() {
 python << END
 import sys
 
-import psycopg2
+import psycopg
 
 try:
-    psycopg2.connect(
+    psycopg.connect(
         dbname="${SQL_DATABASE}",
         user="${SQL_USER}",
         password="${SQL_PASSWORD}",
         host="${SQL_HOST}",
         port="${SQL_PORT}",
     )
-except psycopg2.OperationalError:
+except psycopg.OperationalError:
     sys.exit(-1)
 sys.exit(0)
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,6 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "3.10.9"
 django = "^5.1.3"
-psycopg2-binary = "^2.9.10"
 celery = "^5.4.0"
 flower = "^2.0.1"
 redis = "^5.2.0"
@@ -25,6 +24,8 @@ pysocks = "^1.7.1"
 django-registration = "^5.1.0"
 django-debug-toolbar = "^4.4.6"
 djangorestframework = "^3.15.2"
+psycopg = "^3.2.4"
+psycopg-pool = "^3.2.4"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.4.8"

diff --git a/walter/settings.py b/walter/settings.py
@@ -117,6 +117,9 @@
         "PASSWORD": os.environ.get("SQL_PASSWORD", "password"),
         "HOST": os.environ.get("SQL_HOST", "localhost"),
         "PORT": os.environ.get("SQL_PORT", "5432"),
+        "OPTIONS": {
+            "pool": True,
+        },
     }
 }