From 125216f12bb08938da48bf9f0a9b18e985063e28 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 22 May 2023 18:16:05 +0100 Subject: [PATCH 1/2] Remove outdated comment in log config The now-removed comment was introduced in https://github.com/matrix-org/synapse/pull/8040, and referenced a "twisted" logging handler. That handler has since been removed from the file, so the associated comment is no longer necessary. --- docs/sample_log_config.yaml | 4 +--- synapse/config/logger.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml index 6339160d0022..ae0318122e5f 100644 --- a/docs/sample_log_config.yaml +++ b/docs/sample_log_config.yaml @@ -68,9 +68,7 @@ root: # Write logs to the `buffer` handler, which will buffer them together in memory, # then write them to a file. # - # Replace "buffer" with "console" to log to stderr instead. (Note that you'll - # also need to update the configuration for the `twisted` logger above, in - # this case.) + # Replace "buffer" with "console" to log to stderr instead. # handlers: [buffer] diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 56db875b25b1..1e080133dccf 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -117,9 +117,7 @@ # Write logs to the `buffer` handler, which will buffer them together in memory, # then write them to a file. # - # Replace "buffer" with "console" to log to stderr instead. (Note that you'll - # also need to update the configuration for the `twisted` logger above, in - # this case.) + # Replace "buffer" with "console" to log to stderr instead. # handlers: [buffer] From 4c1d80c8c4998a927fa6bf05e7d15585658aaac8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 22 May 2023 18:18:07 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/15648.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15648.doc diff --git a/changelog.d/15648.doc b/changelog.d/15648.doc new file mode 100644 index 000000000000..70f65ebbff74 --- /dev/null +++ b/changelog.d/15648.doc @@ -0,0 +1 @@ +Remove outdated comment from the generated and sample homeserver log configs. \ No newline at end of file