Skip to content

Commit bc263b0

Browse files
committed
first attempt to add boot script for api-server worker
1 parent e6eb80c commit bc263b0

File tree

1 file changed

+43
-17
lines changed

1 file changed

+43
-17
lines changed

services/api-server/docker/boot.sh

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,49 @@ APP_LOG_LEVEL=${API_SERVER_LOGLEVEL:-${LOG_LEVEL:-${LOGLEVEL:-INFO}}}
3939
SERVER_LOG_LEVEL=$(echo "${APP_LOG_LEVEL}" | tr '[:upper:]' '[:lower:]')
4040
echo "$INFO" "Log-level app/server: $APP_LOG_LEVEL/$SERVER_LOG_LEVEL"
4141

42-
if [ "${SC_BOOT_MODE}" = "debug" ]; then
43-
reload_dir_packages=$(fdfind src /devel/packages --exec echo '--reload-dir {} ' | tr '\n' ' ')
42+
if [ "${API_SERVER_WORKER_MODE}" = "true" ]; then
43+
if [ "${SC_BOOT_MODE}" = "debug" ]; then
44+
exec watchmedo auto-restart \
45+
--directory /devel/packages \
46+
--directory services/api-server \
47+
--pattern "*.py" \
48+
--recursive \
49+
-- \
50+
celery \
51+
--app=simcore_service_api_server.celery.worker_main:app_factory \
52+
worker --pool=threads \
53+
--loglevel="${API_SERVER_LOGLEVEL}" \
54+
--concurrency="${CELERY_CONCURRENCY}" \
55+
--hostname="${API_SERVER_WORKER_NAME}" \
56+
--queues="${CELERY_QUEUES:-default}"
57+
else
58+
exec celery \
59+
--app=simcore_service_api_server.celery.worker_main:app_factory \
60+
worker --pool=threads \
61+
--loglevel="${API_SERVER_LOGLEVEL}" \
62+
--concurrency="${CELERY_CONCURRENCY}" \
63+
--hostname="${API_SERVER_WORKER_NAME}" \
64+
--queues="${CELERY_QUEUES:-default}"
65+
fi
66+
else
67+
if [ "${SC_BOOT_MODE}" = "debug" ]; then
68+
reload_dir_packages=$(fdfind src /devel/packages --exec echo '--reload-dir {} ' | tr '\n' ' ')
4469

45-
exec sh -c "
46-
cd services/api-server/src/simcore_service_api_server && \
47-
python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${API_SERVER_REMOTE_DEBUG_PORT} -m \
48-
uvicorn \
49-
--factory main:app_factory \
70+
exec sh -c "
71+
cd services/api-server/src/simcore_service_api_server && \
72+
python -Xfrozen_modules=off -m debugpy --listen 0.0.0.0:${API_SERVER_REMOTE_DEBUG_PORT} -m \
73+
uvicorn \
74+
--factory main:app_factory \
75+
--host 0.0.0.0 \
76+
--reload \
77+
$reload_dir_packages \
78+
--reload-dir . \
79+
--log-level \"${SERVER_LOG_LEVEL}\"
80+
"
81+
else
82+
exec uvicorn \
83+
--factory simcore_service_api_server.main:app_factory \
5084
--host 0.0.0.0 \
51-
--reload \
52-
$reload_dir_packages \
53-
--reload-dir . \
54-
--log-level \"${SERVER_LOG_LEVEL}\"
55-
"
56-
else
57-
exec uvicorn \
58-
--factory simcore_service_api_server.main:app_factory \
59-
--host 0.0.0.0 \
60-
--log-level "${SERVER_LOG_LEVEL}"
85+
--log-level "${SERVER_LOG_LEVEL}"
86+
fi
6187
fi

0 commit comments

Comments
 (0)