diff options
author | David Robertson <davidr@element.io> | 2022-02-14 13:12:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-14 13:12:22 +0000 |
commit | 4ae956c8bb3d0f9a352934238b4d2a9c48307efb (patch) | |
tree | d568632d9adfd7b240aa745ebda824f070bd76ea /synapse/config | |
parent | Notify users, rather than rooms, of device list updates (#11905) (diff) | |
download | synapse-4ae956c8bb3d0f9a352934238b4d2a9c48307efb.tar.xz |
Use version string helper from matrix-common (#11979)
* Require latest matrix-common * Use the common function
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/logger.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py index ea69b9bd9b..b7145a44ae 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -22,6 +22,7 @@ from string import Template from typing import TYPE_CHECKING, Any, Dict, Optional import yaml +from matrix_common.versionstring import get_distribution_version_string from zope.interface import implementer from twisted.logger import ( @@ -32,11 +33,9 @@ from twisted.logger import ( globalLogBeginner, ) -import synapse from synapse.logging._structured import setup_structured_logging from synapse.logging.context import LoggingContextFilter from synapse.logging.filter import MetadataFilter -from synapse.util.versionstring import get_version_string from ._base import Config, ConfigError @@ -347,6 +346,10 @@ def setup_logging( # Log immediately so we can grep backwards. logging.warning("***** STARTING SERVER *****") - logging.warning("Server %s version %s", sys.argv[0], get_version_string(synapse)) + logging.warning( + "Server %s version %s", + sys.argv[0], + get_distribution_version_string("matrix-synapse"), + ) logging.info("Server hostname: %s", config.server.server_name) logging.info("Instance name: %s", hs.get_instance_name()) |