From 9ee83b89bb914f440cd370f5fac88345b749254a Mon Sep 17 00:00:00 2001 From: Krishna Srinivas Date: Tue, 28 Mar 2017 18:41:16 -0700 Subject: [PATCH] config: Appropriate error message when newer config file is found (#3972) --- cmd/config-v17.go | 5 +++-- cmd/server-main.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/config-v17.go b/cmd/config-v17.go index 838353e60..cae1e1a2b 100644 --- a/cmd/config-v17.go +++ b/cmd/config-v17.go @@ -215,9 +215,10 @@ func validateConfig() error { return err } - // Check if config version is valid if srvCfg.Version != v17 { - return errors.New("bad config version, expected: " + v17) + // Older binary but newer config version. + // Config version can never be older as it would have migrated. + return fmt.Errorf("Expected config version: %s, newer config version found: %s", v17, srvCfg.Version) } // Load config file json and check for duplication json keys diff --git a/cmd/server-main.go b/cmd/server-main.go index c60bf57fa..104806c68 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -169,7 +169,7 @@ func initConfig() { // Validate config file err = validateConfig() - fatalIf(err, "Cannot validate configuration file") + fatalIf(err, "Unable to validate configuration file") // Once we have migrated all the old config, now load them. err = loadConfig(envs)