do not use --preload; added psycogreen and monkey patching to core

SK-CERT · May 17, 2022 · 069d319 · 069d319
1 parent 9a58f1b
commit 069d319
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/docker/Dockerfile.bots b/docker/Dockerfile.bots
@@ -38,7 +38,7 @@ EXPOSE 80
 ENV PYTHONPATH=/app
 ENV MODULE_NAME run
 ENV VARIABLE_NAME app
-ENV GUNICORN_CMD_ARGS --timeout 120 --preload
+ENV GUNICORN_CMD_ARGS --timeout 120
 ENV WORKERS_PER_CORE 8
 
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/docker/Dockerfile.collectors b/docker/Dockerfile.collectors
@@ -61,7 +61,7 @@ EXPOSE 80
 ENV PYTHONPATH=/app
 ENV MODULE_NAME run
 ENV VARIABLE_NAME app
-ENV GUNICORN_CMD_ARGS --timeout 120 --preload
+ENV GUNICORN_CMD_ARGS --timeout 120
 ENV WORKERS_PER_CORE 8
 ENV COLLECTOR_CONFIG_FILE /app/storage/id.txt
 

diff --git a/docker/Dockerfile.core b/docker/Dockerfile.core
@@ -51,7 +51,7 @@ EXPOSE 80
 ENV PYTHONPATH=/app
 ENV MODULE_NAME run
 ENV VARIABLE_NAME app
-ENV GUNICORN_CMD_ARGS --timeout 120 --preload
+ENV GUNICORN_CMD_ARGS --timeout 120
 ENV WORKERS_PER_CORE 8
 
 VOLUME ["/data"]

diff --git a/docker/Dockerfile.presenters b/docker/Dockerfile.presenters
@@ -106,7 +106,7 @@ EXPOSE 80
 ENV PYTHONPATH=/app
 ENV MODULE_NAME run
 ENV VARIABLE_NAME app
-ENV GUNICORN_CMD_ARGS --timeout 120 --preload
+ENV GUNICORN_CMD_ARGS --timeout 120
 ENV WORKERS_PER_CORE 8
 
 VOLUME ["/app/templates"]

diff --git a/docker/Dockerfile.publishers b/docker/Dockerfile.publishers
@@ -39,7 +39,7 @@ COPY ./src/publishers/. /app/
 ENV PYTHONPATH=/app
 ENV MODULE_NAME run
 ENV VARIABLE_NAME app
-ENV GUNICORN_CMD_ARGS --timeout 120 --preload
+ENV GUNICORN_CMD_ARGS --timeout 120
 ENV WORKERS_PER_CORE 8
 
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/src/core/requirements.txt b/src/core/requirements.txt
@@ -18,6 +18,7 @@ Mako==1.1.0
 MarkupSafe==1.1.0
 marshmallow==3.5.0
 marshmallow-enum==1.5.1
+psycogreen==1.0.2
 psycopg2-binary==2.8.4
 PyJWT==1.7.1
 python-dateutil==2.8.1

diff --git a/src/core/run.py b/src/core/run.py
@@ -1,5 +1,11 @@
 #! /usr/bin/env python
 
+# patch things
+from gevent import monkey
+monkey.patch_all()
+from psycogreen import gevent as g
+g.patch_psycopg()
+
 from flask_sse import sse
 
 from app import create_app