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

Fix logging: supervisord loglevel=debug for now

Browse Source
This commit is contained in:
Kristóf Tóth 2018-01-31 11:38:01 +01:00
parent 8bce986b1c
commit 2ad42dbaa7
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -47,7 +47,6 @@ ENV TFW_LOGIN_APP_PORT=6666
ENV TFW_TERMINADO_PORT=7878 ENV TFW_TERMINADO_PORT=7878
ENV TFW_PUBLIC_PORT=8888 ENV TFW_PUBLIC_PORT=8888
ENV TFW_SUPERVISOR_HTTP_PORT=9001 ENV TFW_SUPERVISOR_HTTP_PORT=9001
EXPOSE ${TFW_PUBLIC_PORT} EXPOSE ${TFW_PUBLIC_PORT}
ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers" 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_DIR="/tmp/terminado_server"
ENV TFW_TERMINADO_WD="/home/${AVATAO_USER}" ENV TFW_TERMINADO_WD="/home/${AVATAO_USER}"
ENV TFW_LIB_DIR="/usr/local/lib/" ENV TFW_LIB_DIR="/usr/local/lib/"
ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" 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,4 +12,3 @@ 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,6 +1,3 @@
import logging import logging
from config import LOGLEVEL logging.basicConfig(level=logging.CRITICAL)
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 = %(ENV_TFW_LOGLEVEL)s loglevel = debug
pidfile = /tmp/supervisord.pid pidfile = /tmp/supervisord.pid
[inet_http_server] [inet_http_server]