diff --git a/Dockerfile b/Dockerfile index e394f93..41bb7c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,6 +62,8 @@ 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 297c4bd..8abbde3 100644 --- a/lib/config/envvars.py +++ b/lib/config/envvars.py @@ -12,3 +12,4 @@ 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 808287d..ef5c5c9 100644 --- a/lib/config/logs.py +++ b/lib/config/logs.py @@ -1,5 +1,6 @@ import logging -logging.getLogger().setLevel(logging.DEBUG) +from config import LOGLEVEL -# TODO: configure supervisord loglevel from here + +logging.getLogger().setLevel(LOGLEVEL) diff --git a/supervisord.conf b/supervisord.conf index 0e301e0..799cb6a 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,7 +1,7 @@ [supervisord] user=user logfile = /tmp/supervisord.log -loglevel = DEBUG +loglevel = %(ENV_TFW_LOGLEVEL)s pidfile = /tmp/supervisord.pid [unix_http_server]