From e05a90f96e75b9dbfdd2b2a6cf1f3eb0f4dbe9aa Mon Sep 17 00:00:00 2001 From: darta Date: Tue, 28 Dec 2021 22:29:47 +0100 Subject: [PATCH] feat(api): works with eventlet, also removed some unused packages --- docker/api/Dockerfile | 4 ---- docker/api/requirements.pip3 | 20 ++++---------------- docker/api/src/start.py | 22 +++++++++++++++++----- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 0e9333c..15b91c6 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -17,10 +17,6 @@ COPY ./src /api RUN wget -qO - https://fontawesome.com/v4.7/assets/font-awesome-4.7.0.zip | busybox unzip -d /api/api/static/css/ - -#EXPOSE 7039 -#WORKDIR /api -#CMD [ "python3", "start.py" ] - COPY default.conf /etc/nginx/conf.d/default.conf ADD entrypoint.sh /docker-entrypoint.d/ RUN chmod 775 /docker-entrypoint.d/entrypoint.sh \ No newline at end of file diff --git a/docker/api/requirements.pip3 b/docker/api/requirements.pip3 index f23cf0d..a03792b 100644 --- a/docker/api/requirements.pip3 +++ b/docker/api/requirements.pip3 @@ -1,16 +1,4 @@ -bcrypt==3.1.7 -cffi==1.14.0 -click==7.1.2 -Flask==1.1.2 -Flask-Login==0.5.0 -gevent==20.6.0 -greenlet==0.4.16 -itsdangerous==1.1.0 -Jinja2==2.11.2 -MarkupSafe==1.1.1 -pycparser==2.20 -six==1.15.0 -Werkzeug==1.0.1 -zope.event==4.4 -zope.interface==5.1.0 -python-keycloak==0.24.0 +Flask==2.0.1 +eventlet==0.33.0 +Flask-SocketIO==5.1.0 +python-keycloak==0.26.1 \ No newline at end of file diff --git a/docker/api/src/start.py b/docker/api/src/start.py index d0c5df9..da28c0d 100644 --- a/docker/api/src/start.py +++ b/docker/api/src/start.py @@ -1,11 +1,23 @@ #!flask/bin/python # coding=utf-8 -from gevent import monkey -monkey.patch_all() +from eventlet import monkey_patch -import yaml +monkey_patch() + +from flask_socketio import SocketIO from api import app -if __name__ == '__main__': - app.run(host='0.0.0.0', port=7039, debug=False) #, logger=logger, engineio_logger=engineio_logger) +socketio = SocketIO(app) + +if __name__ == "__main__": + import logging + + logger = logging.getLogger("socketio") + logger.setLevel("ERROR") + engineio_logger = logging.getLogger("engineio") + engineio_logger.setLevel("ERROR") + + socketio.run( + app, host="0.0.0.0", port=7039, debug=False + )