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

Use an int for the config version

Browse source
This commit is contained in:
Mark Haines 2017-07-05 11:57:30 +01:00
parent fcc9a02fff
commit 913915310f
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dendrite-config.yaml
View file

@ -1,5 +1,8 @@
# The config file version format # The config file format version
version: v0 # This is used by dendrite to tell if it understands the config format.
# This will change if the structure of the config file changes or if the meaning
# of an existing config key changes.
version: 0
# The matrix specific config # The matrix specific config
matrix: matrix:

4
src/github.com/matrix-org/dendrite/common/config/config.go
View file

@ -30,7 +30,7 @@ import (
// Version is the current version of the config format. // Version is the current version of the config format.
// This will change whenever we make breaking changes to the config format. // This will change whenever we make breaking changes to the config format.
const Version = "v0" const Version = 0
// Dendrite contains all the config used by a dendrite process. // Dendrite contains all the config used by a dendrite process.
// Relative paths are resolved relative to the current working directory // Relative paths are resolved relative to the current working directory
@ -41,7 +41,7 @@ type Dendrite struct {
// to update their config file to the current version. // to update their config file to the current version.
// The version of the file should only be different if there has // The version of the file should only be different if there has
// been a breaking change to the config file format. // been a breaking change to the config file format.
Version string `yaml:"version"` Version int `yaml:"version"`
// The configuration required for a matrix server. // The configuration required for a matrix server.
Matrix struct { Matrix struct {

2
src/github.com/matrix-org/dendrite/common/config/config_test.go
View file

@ -32,7 +32,7 @@ func TestLoadConfigRelative(t *testing.T) {
} }
const testConfig = ` const testConfig = `
version: v0 version: 0
matrix: matrix:
server_name: localhost server_name: localhost
private_key: matrix_key.pem private_key: matrix_key.pem