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/generic_worker.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/generic_worker.py')
-rw-r--r-- | synapse/app/generic_worker.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 89f8998f0e..4a987fb759 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -16,8 +16,6 @@ import logging import sys from typing import Dict, List, Optional, Tuple -from matrix_common.versionstring import get_distribution_version_string - from twisted.internet import address from twisted.web.resource import Resource @@ -121,6 +119,7 @@ from synapse.storage.databases.main.transactions import TransactionWorkerStore from synapse.storage.databases.main.ui_auth import UIAuthWorkerStore from synapse.storage.databases.main.user_directory import UserDirectoryStore from synapse.types import JsonDict +from synapse.util import SYNAPSE_VERSION from synapse.util.httpresourcetree import create_resource_tree logger = logging.getLogger("synapse.app.generic_worker") @@ -447,7 +446,7 @@ def start(config_options: List[str]) -> None: hs = GenericWorkerServer( config.server.server_name, config=config, - version_string="Synapse/" + get_distribution_version_string("matrix-synapse"), + version_string=f"Synapse/{SYNAPSE_VERSION}", ) setup_logging(hs, config, use_worker_options=True) |