diff --git a/Dockerfile b/Dockerfile index 41bb7c6..943e034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,6 @@ ENV TFW_LOGIN_APP_PORT=6666 ENV TFW_TERMINADO_PORT=7878 ENV TFW_PUBLIC_PORT=8888 ENV TFW_SUPERVISOR_HTTP_PORT=9001 - EXPOSE ${TFW_PUBLIC_PORT} ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers" @@ -57,13 +56,9 @@ ENV TFW_LOGIN_APP_DIR="/tmp/source_code_server" ENV TFW_TERMINADO_DIR="/tmp/terminado_server" ENV TFW_TERMINADO_WD="/home/${AVATAO_USER}" ENV TFW_LIB_DIR="/usr/local/lib/" - ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" - ENV PYTHONPATH=${TFW_LIB_DIR} -ENV TFW_LOGLEVEL="debug" - COPY src/nginx /etc/nginx RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \ # nginx runs as a regular user, and can't write to /run diff --git a/lib/config/envvars.py b/lib/config/envvars.py index 8abbde3..297c4bd 100644 --- a/lib/config/envvars.py +++ b/lib/config/envvars.py @@ -12,4 +12,3 @@ SUPERVISOR_HTTP_URI = 'http://localhost:{}'.format(SUPERVISOR_HTTP_PORT) LOGIN_APP_DIR = os.getenv('TFW_LOGIN_APP_DIR') TERMINADO_DIR = os.getenv('TFW_TERMINADO_DIR') -LOGLEVEL = os.getenv('TFW_LOGLEVEL').upper() diff --git a/lib/config/logs.py b/lib/config/logs.py index ef5c5c9..94412b9 100644 --- a/lib/config/logs.py +++ b/lib/config/logs.py @@ -1,6 +1,3 @@ import logging -from config import LOGLEVEL - - -logging.getLogger().setLevel(LOGLEVEL) +logging.basicConfig(level=logging.CRITICAL) diff --git a/supervisord.conf b/supervisord.conf index 75f28a6..441cbd7 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,7 +1,7 @@ [supervisord] user=user logfile = /tmp/supervisord.log -loglevel = %(ENV_TFW_LOGLEVEL)s +loglevel = debug pidfile = /tmp/supervisord.pid [inet_http_server]