Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 8471ca3

Browse files
committed
Remove special-case for twisted logger
This was originally added when we first added a `MemoryHandler` to the default log config back in #8040, to ensure that we didn't explode with an infinite loop if there was an error formatting the logs. Since then, we made additional improvements to logging which make this workaround redundant. In particular: * we no longer attempt to log un-UTF8-decodable byte sequences, which were the most likely cause of an error in the first place. * #8268 ensures that in the unlikely case that there *is* an error, it won't cause an infinite loop.
1 parent 78b99de commit 8471ca3

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

changelog.d/12589.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove special-case for `twisted` logger from default log config.

docs/sample_log_config.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ loggers:
6262
# information such as access tokens.
6363
level: INFO
6464

65-
twisted:
66-
# We send the twisted logging directly to the file handler,
67-
# to work around https://github.com/matrix-org/synapse/issues/3471
68-
# when using "buffer" logger. Use "console" to log to stderr instead.
69-
handlers: [file]
70-
propagate: false
71-
7265
root:
7366
level: INFO
7467

synapse/config/logger.py

-7
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,6 @@
110110
# information such as access tokens.
111111
level: INFO
112112
113-
twisted:
114-
# We send the twisted logging directly to the file handler,
115-
# to work around https://github.com/matrix-org/synapse/issues/3471
116-
# when using "buffer" logger. Use "console" to log to stderr instead.
117-
handlers: [file]
118-
propagate: false
119-
120113
root:
121114
level: INFO
122115

0 commit comments

Comments
 (0)