Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
269cab691e | ||
|
|
16f0335d76 | ||
|
|
52280acf41 |
+1
-1
@@ -73,7 +73,7 @@ ONBUILD COPY ${BUILD_CONTEXT}/supervisor/ ${TFW_SUPERVISORD_COMPONENTS}
|
||||
ONBUILD RUN for f in "${TFW_NGINX_DEFAULT}" ${TFW_NGINX_COMPONENTS}/*.conf; do \
|
||||
envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" < $f > $f~ && mv $f~ $f ;\
|
||||
done
|
||||
ONBUILD VOLUME ["/etc/nginx", "/var/lib/nginx", "/var/log/nginx", "${TFW_LIB_DIR}/tfw"]
|
||||
ONBUILD VOLUME ["/etc/nginx", "/etc/supervisor", "/var/lib/nginx", "/var/log/nginx", "${TFW_LIB_DIR}/tfw"]
|
||||
|
||||
ENTRYPOINT ["/bin/init", "--"]
|
||||
CMD exec supervisord --nodaemon --configuration ${TFW_SUPERVISORD_CONF}
|
||||
|
||||
@@ -4,3 +4,4 @@ directory=/tmp
|
||||
command=bash tfw_init.sh
|
||||
autorestart=false
|
||||
startsecs=0
|
||||
priority=1
|
||||
|
||||
@@ -2,3 +2,4 @@
|
||||
user=root
|
||||
directory=%(ENV_TFW_SERVER_DIR)s
|
||||
command=python3 -u tfw_server.py
|
||||
priority=2
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
from datetime import datetime
|
||||
from typing import TextIO, Union
|
||||
from dataclasses import dataclass
|
||||
from collections.abc import Mapping
|
||||
from traceback import format_exception
|
||||
from logging import DEBUG, getLogger, Handler, Formatter, Filter
|
||||
|
||||
@@ -81,7 +82,7 @@ class LogFormatter(Formatter):
|
||||
def format(self, record):
|
||||
time = datetime.utcfromtimestamp(record.created).strftime('%H:%M:%S')
|
||||
if record.args:
|
||||
tuple_args = (record.args,) if isinstance(record.args, dict) else record.args
|
||||
tuple_args = (record.args,) if isinstance(record.args, Mapping) else record.args
|
||||
clean_args = tuple((self.trim(arg) for arg in tuple_args))
|
||||
message = record.msg % clean_args
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user