mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

set yaml config key & fix validation logic

Browse source
This commit is contained in:
Sam Wedgwood 2023-08-07 15:31:32 +01:00
parent 2da09ef2f5
commit 5eb20daf15
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup/config/config_roomserver.go
View file

@ -10,7 +10,7 @@ import (
type RoomServer struct { type RoomServer struct {
Matrix *Global `yaml:"-"` Matrix *Global `yaml:"-"`
DefaultRoomVersion gomatrixserverlib.RoomVersion DefaultRoomVersion gomatrixserverlib.RoomVersion `yaml:"default_room_version,omitempty"`
Database DatabaseOptions `yaml:"database,omitempty"` Database DatabaseOptions `yaml:"database,omitempty"`
} }
@ -30,8 +30,8 @@ func (c *RoomServer) Verify(configErrs *ConfigErrors) {
} }
if !gomatrixserverlib.KnownRoomVersion(c.DefaultRoomVersion) { if !gomatrixserverlib.KnownRoomVersion(c.DefaultRoomVersion) {
configErrs.Add(fmt.Sprintf("invalid value for config key 'room_server.default_room_version': unsupported default room version: %q", c.DefaultRoomVersion)) configErrs.Add(fmt.Sprintf("invalid value for config key 'room_server.default_room_version': unsupported room version: %q", c.DefaultRoomVersion))
} else if gomatrixserverlib.StableRoomVersion(c.DefaultRoomVersion) { } else if !gomatrixserverlib.StableRoomVersion(c.DefaultRoomVersion) {
log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion) log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion)
} }
} }