mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 23:31:31 +00:00
Code Issues Releases Wiki Activity

Implement loglevel configuration from Dockerfile

Browse Source
This commit is contained in:
Kristóf Tóth 2018-01-30 10:49:16 +01:00
parent 071167d3d7
commit 0e38bef92e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -62,6 +62,8 @@ ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf"
ENV PYTHONPATH=${TFW_LIB_DIR} ENV PYTHONPATH=${TFW_LIB_DIR}
ENV TFW_LOGLEVEL="debug"
COPY src/nginx /etc/nginx COPY src/nginx /etc/nginx
RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \ RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \
# nginx runs as a regular user, and can't write to /run # nginx runs as a regular user, and can't write to /run

1
lib/config/envvars.py
View File

@ -12,3 +12,4 @@ SUPERVISOR_HTTP_URI = 'http://localhost:{}'.format(SUPERVISOR_HTTP_PORT)
LOGIN_APP_DIR = os.getenv('TFW_LOGIN_APP_DIR') LOGIN_APP_DIR = os.getenv('TFW_LOGIN_APP_DIR')
TERMINADO_DIR = os.getenv('TFW_TERMINADO_DIR') TERMINADO_DIR = os.getenv('TFW_TERMINADO_DIR')
LOGLEVEL = os.getenv('TFW_LOGLEVEL').upper()

5
lib/config/logs.py
View File

@ -1,5 +1,6 @@
import logging import logging
logging.getLogger().setLevel(logging.DEBUG) from config import LOGLEVEL
# TODO: configure supervisord loglevel from here
logging.getLogger().setLevel(LOGLEVEL)

2
supervisord.conf
View File

@ -1,7 +1,7 @@
[supervisord] [supervisord]
user=user user=user
logfile = /tmp/supervisord.log logfile = /tmp/supervisord.log
loglevel = DEBUG loglevel = %(ENV_TFW_LOGLEVEL)s
pidfile = /tmp/supervisord.pid pidfile = /tmp/supervisord.pid
[unix_http_server] [unix_http_server]