Skip to content

Commit 00734a6

Browse files
authored
Stop rsyslog from de-duplicating log lines (#6291)
When rsyslog receives multiple identical log lines in a row, it can collapse those lines into a single instance of the log line and a follow-up line saying "message repeated X times". However, that rsyslog-generated line does not contain our log line checksum, so it immediately causes log-validator to complain about the line. In addition, the rsyslog docs themselves state that this feature is a misfeature and should never be turned on. Despite this, Ubuntu turns the feature on by default when the rsyslog package is installed from apt. Add an additional command to our dockerfile which overwrites Ubuntu's default setting to disable this misfeature, and update our test environment to use the new docker image. Fixes #6252
1 parent 7fc9cf1 commit 00734a6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/boulder-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
matrix:
3737
# Add additional docker image tags here and all tests will be run with the additional image.
3838
BOULDER_TOOLS_TAG:
39-
- go1.18.4_2022-08-03
40-
- go1.19_2022-08-03
39+
- go1.18.4_2022-08-11
40+
- go1.19_2022-08-11
4141
# Tests command definitions. Use the entire docker-compose command you want to run.
4242
tests:
4343
# Run ./test.sh --help for a description of each of the flags.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
# used for release builds. make-deb.sh relies on being able to parse the
66
# numeric version between 'go' and the underscore-prefixed date. If you make
77
# changes to these tokens, please update this parsing logic.
8-
image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.18.4_2022-08-03}
8+
image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.18.4_2022-08-11}
99
environment:
1010
FAKE_DNS: 10.77.77.77
1111
BOULDER_CONFIG_DIR: test/config

test/boulder-tools/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ COPY requirements.txt /tmp/requirements.txt
1212
COPY boulder.rsyslog.conf /etc/rsyslog.d/
1313
COPY build.sh /tmp/build.sh
1414
RUN /tmp/build.sh
15-
RUN sed -i '/$ActionFileDefaultTemplate/s/^/#/' /etc/rsyslog.conf
1615
RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
16+
RUN sed -i '/$ActionFileDefaultTemplate/s/^/#/' /etc/rsyslog.conf
17+
RUN sed -i '/$RepeatedMsgReduction on/s/^/#/' /etc/rsyslog.conf

0 commit comments

Comments
 (0)