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/admin_cmd.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/admin_cmd.py')
| -rw-r--r-- | synapse/app/admin_cmd.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index 6fedf681f8..561621a285 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -19,8 +19,6 @@ import sys import tempfile from typing import List, Optional -from matrix_common.versionstring import get_distribution_version_string - from twisted.internet import defer, task import synapse @@ -43,6 +41,7 @@ from synapse.replication.slave.storage.registration import SlavedRegistrationSto from synapse.server import HomeServer from synapse.storage.databases.main.room import RoomWorkerStore from synapse.types import StateMap +from synapse.util import SYNAPSE_VERSION from synapse.util.logcontext import LoggingContext logger = logging.getLogger("synapse.app.admin_cmd") @@ -220,7 +219,7 @@ def start(config_options: List[str]) -> None: ss = AdminCmdServer( config.server.server_name, config=config, - version_string="Synapse/" + get_distribution_version_string("matrix-synapse"), + version_string=f"Synapse/{SYNAPSE_VERSION}", ) setup_logging(ss, config, use_worker_options=True) |