mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-13 11:33:25 +01:00
1903c7e5ed
Fix https://github.com/matrix-org/synapse/issues/15618
### Before
```
2023-05-17 22:51:36-0500 [-] 2023-05-17 22:51:36,889 - synapse.server - 338 - INFO - sentinel - Finished setting up.
```
### After
```
2023-05-19 18:16:20-0500 [-] synapse.server - 338 - INFO - sentinel - Finished setting up.
```
### Dev notes
The `Twisted.Logger` controls the `2023-05-19 18:16:20-0500 [-]` prefix, see : [`twisted/twisted` -> `src/twisted/logger/_format.py#L362-L374`](34b161e66b/src/twisted/logger/_format.py (L362-L374))
And we delegate our logs to the Twisted Logger for the tests which puts it in `_trial_temp/test.log`
56 lines
1.8 KiB
Python
56 lines
1.8 KiB
Python
# Copyright 2019 New Vector Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
import logging
|
|
import os
|
|
|
|
import twisted.logger
|
|
|
|
from synapse.logging.context import LoggingContextFilter
|
|
from synapse.synapse_rust import reset_logging_config
|
|
|
|
|
|
class ToTwistedHandler(logging.Handler):
|
|
"""logging handler which sends the logs to the twisted log"""
|
|
|
|
tx_log = twisted.logger.Logger()
|
|
|
|
def emit(self, record: logging.LogRecord) -> None:
|
|
log_entry = self.format(record)
|
|
log_level = record.levelname.lower().replace("warning", "warn")
|
|
self.tx_log.emit(
|
|
twisted.logger.LogLevel.levelWithName(log_level), "{entry}", entry=log_entry
|
|
)
|
|
|
|
|
|
def setup_logging() -> None:
|
|
"""Configure the python logging appropriately for the tests.
|
|
|
|
(Logs will end up in _trial_temp.)
|
|
"""
|
|
root_logger = logging.getLogger()
|
|
|
|
# We exclude `%(asctime)s` from this format because the Twisted logger adds its own
|
|
# timestamp
|
|
log_format = "%(name)s - %(lineno)d - " "%(levelname)s - %(request)s - %(message)s"
|
|
|
|
handler = ToTwistedHandler()
|
|
formatter = logging.Formatter(log_format)
|
|
handler.setFormatter(formatter)
|
|
handler.addFilter(LoggingContextFilter())
|
|
root_logger.addHandler(handler)
|
|
|
|
log_level = os.environ.get("SYNAPSE_TEST_LOG_LEVEL", "ERROR")
|
|
root_logger.setLevel(log_level)
|
|
|
|
reset_logging_config()
|