aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-18 14:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Install gevent-websocket and use it by default until we have a better solution (#850)

Browse Source 
* Install `gevent-websocket` and use it by default until we have a better solution
* May help with #849
This commit is contained in:
Kevin Chung
2019-01-24 02:47:50 -05:00
committed by GitHub
parent 06f0715369
commit ae8ce0b430
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CTFd/config.py
View File

@@ -209,8 +209,8 @@ class Config(object):
Example: /ctfd Example: /ctfd
SOCKETIO_ASYNC_MODE: SOCKETIO_ASYNC_MODE:
Specifies what async mode SocketIO should use. The simplest but least performant option is 'threading'. Specifies what async mode SocketIO should use.
Switching to a different async mode is not recommended without the appropriate load balancing mechanisms Specifying your own async mode is not recommended without the appropriate load balancing mechanisms
in place and proper understanding of how websockets are supported by Flask. in place and proper understanding of how websockets are supported by Flask.
https://flask-socketio.readthedocs.io/en/latest/#deployment https://flask-socketio.readthedocs.io/en/latest/#deployment
''' '''
@@ -219,7 +219,7 @@ class Config(object):
SQLALCHEMY_TRACK_MODIFICATIONS = (not os.getenv("SQLALCHEMY_TRACK_MODIFICATIONS")) # Defaults True SQLALCHEMY_TRACK_MODIFICATIONS = (not os.getenv("SQLALCHEMY_TRACK_MODIFICATIONS")) # Defaults True
UPDATE_CHECK = (not os.getenv("UPDATE_CHECK")) # Defaults True UPDATE_CHECK = (not os.getenv("UPDATE_CHECK")) # Defaults True
APPLICATION_ROOT = os.getenv('APPLICATION_ROOT') or '/' APPLICATION_ROOT = os.getenv('APPLICATION_ROOT') or '/'
SOCKETIO_ASYNC_MODE = os.getenv('SOCKETIO_ASYNC_MODE') or 'threading' SOCKETIO_ASYNC_MODE = os.getenv('SOCKETIO_ASYNC_MODE')
''' '''
=== OAUTH === === OAUTH ===

3
docker-entrypoint.sh
View File

@@ -2,6 +2,7 @@
set -eo pipefail set -eo pipefail
WORKERS=${WORKERS:-1} WORKERS=${WORKERS:-1}
WORKER_CLASS=${WORKER_CLASS:-geventwebsocket.gunicorn.workers.GeventWebSocketWorker}
ACCESS_LOG=${ACCESS_LOG:--} ACCESS_LOG=${ACCESS_LOG:--}
ERROR_LOG=${ERROR_LOG:--} ERROR_LOG=${ERROR_LOG:--}
@@ -40,6 +41,6 @@ echo "Starting CTFd"
exec gunicorn 'CTFd:create_app()' \ exec gunicorn 'CTFd:create_app()' \
--bind '0.0.0.0:8000' \ --bind '0.0.0.0:8000' \
--workers $WORKERS \ --workers $WORKERS \
--worker-class 'gevent' \ --worker-class "$WORKER_CLASS" \
--access-logfile "$ACCESS_LOG" \ --access-logfile "$ACCESS_LOG" \
--error-logfile "$ERROR_LOG" --error-logfile "$ERROR_LOG"

1
requirements.txt
View File

@@ -20,6 +20,7 @@ netaddr==0.7.19
redis==2.10.6 redis==2.10.6
datafreeze==0.1.0 datafreeze==0.1.0
gevent==1.3.7 gevent==1.3.7
gevent-websocket==0.10.1
python-dotenv==0.9.1 python-dotenv==0.9.1
flask-restplus==0.12.1 flask-restplus==0.12.1
pathlib2==2.3.2 pathlib2==2.3.2