Apache and Gunicorn Tweaks

Dockerfile

@@ -73,6 +73,12 @@ COPY docker/supervisord-aws-xray.conf /etc/supervisor/conf.d/aws-xray.conf
 COPY docker/apache-config /etc/apache2/sites-available/gracedb.conf
 COPY docker/mpm_prefork.conf /etc/apache2/mods-enabled/mpm_prefork.conf
 
+# Enable mpm_event module:
+
+RUN rm /etc/apache2/mods-enabled/mpm_prefork.*
+RUN rm /etc/apache2/mods-enabled/php7.4.*
+RUN cp  /etc/apache2/mods-available/mpm_event.* /etc/apache2/mods-enabled/
+
 # Shibboleth configs and certs:
 COPY docker/shibboleth-ds /etc/shibboleth-ds
 COPY docker/login.ligo.org.cert.LIGOCA.pem /etc/shibboleth/login.ligo.org.cert.LIGOCA.pem

config/gunicorn_config.py

@@ -51,7 +51,7 @@ threads = int(get_from_env('GUNICORN_THREADS',
 # Worker connections. Limit the number of connections between apache<-->gunicorn
 # This avoids the situation 
 
-worker_connections = workers
+worker_connections = workers * threads
 
 # Worker class ----------------------------------------------------------------
 # sync by default, generally safe and low-resource:

docker/apache-config

@@ -40,7 +40,7 @@ ServerName ${DJANGO_PRIMARY_FQDN}
   ProxyPass "/static" "!"
   ProxyPass "/documentation" "!"
   ProxyPass "/admin_docs" "!"
-  ProxyPass "/" "http://localhost:8080/" timeout=30
+  ProxyPass "/" "http://localhost:8080/" timeout=120
   ProxyPassReverse "/" "http://localhost:8080/"
 
   # This section is for apache2 timeout and keepalive tuning parameters. 

requirements.txt

@@ -19,10 +19,7 @@ dnspython==2.4.1
 flake8==3.9.2
 gpstime==0.6.2
 gssapi==1.8.2
-#gunicorn==20.1.0
-# Run the fixed version of gunicorn until a release comes out:
-# https://github.com/benoitc/gunicorn/issues/2917
-git+https://github.com/benoitc/gunicorn.git@a423fca8e5bf78f64ee10e0e754b7b65eabc69cf
+gunicorn[gthread]==21.2.0
 hop-client==0.8.0
 html5lib==1.1.0
 igwn-alert-overseer==0.6.0