airship/armada
Code Issues Proposed changes

Merge "api: Update entrypoint script with proper quotes"

Browse Source
This commit is contained in:
Zuul 2018-10-18 15:38:41 +00:00 committed by Gerrit Code Review
commit e1179a8ba8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
entrypoint.sh
View File

@ -21,11 +21,11 @@ CMD="armada"
# Define port # Define port
ARMADA_UWSGI_PORT=${ARMADA_UWSGI_PORT:-8000} ARMADA_UWSGI_PORT=${ARMADA_UWSGI_PORT:-8000}
# How long uWSGI should wait for each Armada response # How long uWSGI should wait for each Armada response
ARMADA_UWSGI_TIMEOUT=${ARMADA_UWSGI_TIMEOUT:-"3600"} ARMADA_UWSGI_TIMEOUT=${ARMADA_UWSGI_TIMEOUT:-3600}
# Number of uWSGI workers to handle API requests # Number of uWSGI workers to handle API requests
ARMADA_UWSGI_WORKERS=${ARMADA_UWSGI_WORKERS:-"4"} ARMADA_UWSGI_WORKERS=${ARMADA_UWSGI_WORKERS:-4}
# Threads per worker # Threads per worker
ARMADA_UWSGI_THREADS=${ARMADA_UWSGI_THREADS:-"1"} ARMADA_UWSGI_THREADS=${ARMADA_UWSGI_THREADS:-1}
# Start Armada application # Start Armada application
# TODO(fmontei): Should be specifying callable too. But Armada spins up the # TODO(fmontei): Should be specifying callable too. But Armada spins up the
@ -34,16 +34,16 @@ if [ "$1" = 'server' ]; then
exec uwsgi \ exec uwsgi \
-b 32768 \ -b 32768 \
--die-on-term \ --die-on-term \
--http :${ARMADA_UWSGI_PORT} \ --http :"${ARMADA_UWSGI_PORT}" \
--http-timeout $ARMADA_UWSGI_TIMEOUT \ --http-timeout "$ARMADA_UWSGI_TIMEOUT" \
--enable-threads \ --enable-threads \
-L \ -L \
--lazy-apps \ --lazy-apps \
--master \ --master \
--paste config:/etc/armada/api-paste.ini \ --paste config:/etc/armada/api-paste.ini \
--pyargv "--config-file /etc/armada/armada.conf" \ --pyargv "--config-file /etc/armada/armada.conf" \
--threads $ARMADA_UWSGI_THREADS \ --threads "$ARMADA_UWSGI_THREADS" \
--workers $ARMADA_UWSGI_WORKERS --workers "$ARMADA_UWSGI_WORKERS"
else else
exec $CMD "$@" exec $CMD "$@"
fi fi