mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-06 22:43:10 -06:00
set yaml config key & fix validation logic
This commit is contained in:
parent
2da09ef2f5
commit
5eb20daf15
|
|
@ -10,7 +10,7 @@ import (
|
|||
type RoomServer struct {
|
||||
Matrix *Global `yaml:"-"`
|
||||
|
||||
DefaultRoomVersion gomatrixserverlib.RoomVersion
|
||||
DefaultRoomVersion gomatrixserverlib.RoomVersion `yaml:"default_room_version,omitempty"`
|
||||
|
||||
Database DatabaseOptions `yaml:"database,omitempty"`
|
||||
}
|
||||
|
|
@ -30,8 +30,8 @@ func (c *RoomServer) Verify(configErrs *ConfigErrors) {
|
|||
}
|
||||
|
||||
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))
|
||||
} else if gomatrixserverlib.StableRoomVersion(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) {
|
||||
log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue