diff options
author | David Robertson <davidr@element.io> | 2022-06-07 15:24:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-07 15:24:11 +0100 |
commit | f30bcbd84a651de59777b2a749850f6ca56ce3f0 (patch) | |
tree | 8a66fdf82df9a061ca9664b214d23145ee178e1b /synapse/app/homeserver.py | |
parent | Reduce amount of state we pull out when attempting to send catchup PDUs. (#12... (diff) | |
download | synapse-f30bcbd84a651de59777b2a749850f6ca56ce3f0.tar.xz |
Fix Synapse git info missing in version strings (#12973)
Diffstat (limited to 'synapse/app/homeserver.py')
-rw-r--r-- | synapse/app/homeserver.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 4c6c0658ab..745e704141 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -18,8 +18,6 @@ import os import sys from typing import Dict, Iterable, List -from matrix_common.versionstring import get_distribution_version_string - from twisted.internet.tcp import Port from twisted.web.resource import EncodingResourceWrapper, Resource from twisted.web.server import GzipEncoderFactory @@ -69,7 +67,7 @@ from synapse.rest.synapse.client import build_synapse_client_resource_tree from synapse.rest.well_known import well_known_resource from synapse.server import HomeServer from synapse.storage import DataStore -from synapse.util.check_dependencies import check_requirements +from synapse.util.check_dependencies import VERSION, check_requirements from synapse.util.httpresourcetree import create_resource_tree from synapse.util.module_loader import load_module @@ -371,7 +369,7 @@ def setup(config_options: List[str]) -> SynapseHomeServer: hs = SynapseHomeServer( config.server.server_name, config=config, - version_string="Synapse/" + get_distribution_version_string("matrix-synapse"), + version_string=f"Synapse/{VERSION}", ) synapse.config.logger.setup_logging(hs, config, use_worker_options=False) |