Skip to content

Commit c9e933c

Browse files
committed
Separate json logging config file json
1 parent 1abb5b9 commit c9e933c

File tree

8 files changed

+13
-16
lines changed

8 files changed

+13
-16
lines changed

base.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ eggs =
133133
zc.z3monitor
134134
imio.prometheus
135135
collective.big.bang
136-
ftw.structlog
137136

138137
zcml =
139138
Products.PloneMeeting-overrides
@@ -143,7 +142,6 @@ zcml =
143142
collective.monitor
144143
imio.prometheus
145144
collective.big.bang
146-
ftw.structlog
147145

148146
[instance-async]
149147
<= instance1

buildout.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ extends =
2727
# amqp.cfg
2828
# solr.cfg
2929
# ldap.cfg
30+
# logging.cfg

docker-dev.cfg

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,6 @@ environment-vars -=
2727
ACTIVE_BIGBANG True
2828
ADMIN_PASSWORD ${port:admin-password}
2929

30-
; makes shitty json beware
31-
;event-log-custom =
32-
; <syslog>
33-
; address ${port:logs-server}
34-
; facility local3
35-
; format {"timestamp": "%(asctime)s", "hostname": "${facts:hostname}", "process": "zope[%(process)s]:", "cluster": "${port:cluster}", "section": "${:_buildout_section_name_}", "level": "[%(levelname)s]", "name": "%(name)s |", "message": "%(message)s"
36-
; dateformat %b %d %H:%M:%S
37-
; level info
38-
; </syslog>
39-
; <logfile>
40-
; path ${buildout:directory}/var/log/${:_buildout_section_name_}.log
41-
; level INFO
42-
; </logfile>
43-
4430
[instance-amqp]
4531
blob-storage = /data/blobstorage
4632

docker/Dockerfile-base

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ RUN add-apt-repository -yu ppa:libreoffice/libreoffice-still \
7474
&& echo " $PROFILE" >> buildout.cfg \
7575
&& echo " amqp.cfg" >> buildout.cfg \
7676
&& echo " ldap.cfg" >> buildout.cfg \
77+
&& echo " logging.cfg" >> buildout.cfg \
7778
&& echo " docker.cfg" >> buildout.cfg \
7879
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
7980
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \

docker/Dockerfile-dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN sed -i "s/\${buildout:directory}\/var/\/data/g" *.cfg \
4545
&& echo " $PROFILE" >> buildout.cfg \
4646
&& echo " amqp.cfg" >> buildout.cfg \
4747
&& echo " ldap.cfg" >> buildout.cfg \
48+
&& echo " logging.cfg" >> buildout.cfg \
4849
&& echo " docker-dev.cfg" >> buildout.cfg \
4950
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
5051
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \

docker/Dockerfile-test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN rm -fr bin include lib local share downloads .installed.cfg \
1818
&& echo " $PROFILE" >> buildout.cfg \
1919
&& echo " amqp.cfg" >> buildout.cfg \
2020
&& echo " ldap.cfg" >> buildout.cfg \
21+
&& echo " logging.cfg" >> buildout.cfg \
2122
&& echo " docker-dev.cfg" >> buildout.cfg \
2223
&& echo "Bouildout config :" \
2324
&& cat buildout.cfg \

docker/Dockerfile-ubuntu-20.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN apt-get update \
6666
&& echo " $PROFILE" >> buildout.cfg \
6767
&& echo " amqp.cfg" >> buildout.cfg \
6868
&& echo " ldap.cfg" >> buildout.cfg \
69+
&& echo " logging.cfg" >> buildout.cfg \
6970
&& echo " docker.cfg" >> buildout.cfg \
7071
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
7172
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \

logging.cfg

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[instance1]
2+
eggs +=
3+
ftw.structlog
4+
5+
zcml +=
6+
ftw.structlog
7+
8+
z2-log = disable

0 commit comments

Comments
 (0)