Merge pull request #231 from CybercentreCanada/hotfix/uwsgi

Hotfix/uwsgi
CybercentreCanada · Jul 19, 2021 · 6cd8260 · 6cd8260
2 parents 7fad016 + 169a896
commit 6cd8260
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
@@ -37,12 +37,4 @@ COPY --chown=assemblyline:assemblyline --from=builder /var/lib/assemblyline/.loc
 # Switch back to assemblyline and run the app
 USER assemblyline
 
-ENV UWSGI_MAX_REQUESTS=${MAX_REQUESTS:-1000}
-ENV UWSGI_MAX_REQUESTS_DELTA=${MAX_REQUESTS_JITTER:-100}
-ENV UWSGI_WORKERS=${WORKERS:-2}
-ENV UWSGI_THREADS=${THREADS:-25}
-ENV UWSGI_PROTOCOL=${PROTOCOL:-http}
-ENV UWSGI_SOCKET=0.0.0.0:${PORT:-5000}
-ENV UWSGI_BUFFER_SIZE=${BUFFER_SIZE:-65535}
-
-CMD ["uwsgi", "--master", "--disable-logging", "--enable-threads", "--die-on-term", "--module", "assemblyline_ui.app:app"]
+CMD ["gunicorn", "assemblyline_ui.patched:app", "--config=python:assemblyline_ui.gunicorn_config", "--worker-class", "gevent"]
diff --git a/setup.py b/setup.py
@@ -46,7 +46,8 @@
         'authlib',
         'fido2',
         'PyJWT',
-        'uwsgi'
+        'gunicorn',
+        'gevent',
     ],
     extras_require={
         'test': [
@@ -55,10 +56,8 @@
             'cart'
         ],
         'socketio': [
-            'gunicorn',
             'python-socketio<5.0.0',
             'flask-socketio<5.0.0',
-            'gevent',
             'gevent-websocket',
         ]
     },