diff options
| author | reivilibre <38398653+reivilibre@users.noreply.github.com> | 2021-08-03 11:30:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 11:30:39 +0100 |
| commit | f4ac934afe1d91bb0cc1bb6dafc77a94165aa740 (patch) | |
| tree | 547e796ee12f627584d4bc92f7dedd972e7ac23f | |
| parent | Extend the release script to tag and create the releases. (#10496) (diff) | |
| download | synapse-f4ac934afe1d91bb0cc1bb6dafc77a94165aa740.tar.xz | |
Revert use of PeriodicallyFlushingMemoryHandler by default (#10515)
| -rw-r--r-- | changelog.d/10515.feature | 1 | ||||
| -rw-r--r-- | docs/sample_log_config.yaml | 5 | ||||
| -rw-r--r-- | synapse/config/logger.py | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/changelog.d/10515.feature b/changelog.d/10515.feature new file mode 100644 index 0000000000..db277d9ecd --- /dev/null +++ b/changelog.d/10515.feature @@ -0,0 +1 @@ +Add a buffered logging handler which periodically flushes itself. diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml index b088c83405..669e600081 100644 --- a/docs/sample_log_config.yaml +++ b/docs/sample_log_config.yaml @@ -28,7 +28,7 @@ handlers: # will be a delay for INFO/DEBUG logs to get written, but WARNING/ERROR # logs will still be flushed immediately. buffer: - class: synapse.logging.handlers.PeriodicallyFlushingMemoryHandler + class: logging.handlers.MemoryHandler target: file # The capacity is the number of log lines that are buffered before # being written to disk. Increasing this will lead to better @@ -36,9 +36,6 @@ handlers: # be written to disk. capacity: 10 flushLevel: 30 # Flush for WARNING logs as well - # The period of time, in seconds, between forced flushes. - # Messages will not be delayed for longer than this time. - period: 5 # A handler that writes logs to stderr. Unused by default, but can be used # instead of "buffer" and "file" in the logger handlers. diff --git a/synapse/config/logger.py b/synapse/config/logger.py index dcd3ed1dac..ad4e6e61c3 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -71,7 +71,7 @@ handlers: # will be a delay for INFO/DEBUG logs to get written, but WARNING/ERROR # logs will still be flushed immediately. buffer: - class: synapse.logging.handlers.PeriodicallyFlushingMemoryHandler + class: logging.handlers.MemoryHandler target: file # The capacity is the number of log lines that are buffered before # being written to disk. Increasing this will lead to better @@ -79,9 +79,6 @@ handlers: # be written to disk. capacity: 10 flushLevel: 30 # Flush for WARNING logs as well - # The period of time, in seconds, between forced flushes. - # Messages will not be delayed for longer than this time. - period: 5 # A handler that writes logs to stderr. Unused by default, but can be used # instead of "buffer" and "file" in the logger handlers. |