5376b9e271
* New config files As decided, config files are parsed at runtime. I decided to go for YAML config files because there can be comments in it. There are 2 files: * config/default_config.yml <= which shouldn't be edited unless we add a config parameter * config/config.yml <= which is the user-defined config. This file shouldn't be commited Changed every call to config.XXX to config.Conf.XXX (look to the new stucture of config in config/types.go) Of course, putting config parameters in config.yml overrides config in config_default.yml. You don't have to put everything in it, just add what you want to override. * Fixing test Replacing conf.New by config.Conf * Fixing call to config.Conf to config.Config{} in test files * Might have fixed testing with this Printf instead of Fatalf * Renaming config.yml in example file * Forbid commiting config.yml * Should be now fixed * Do not need this file anymore
25 lignes
457 o
Go
25 lignes
457 o
Go
package config
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"log"
|
|
|
|
yaml "gopkg.in/yaml.v2"
|
|
)
|
|
|
|
// DefaultConfig : Default configuration
|
|
var DefaultConfig *Config
|
|
|
|
func getDefaultConfig() *Config {
|
|
DefaultConfig = &Config{}
|
|
path := "config/default_config.yml"
|
|
data, err := ioutil.ReadFile(path)
|
|
if err != nil {
|
|
log.Printf("can't read file '%s'", path)
|
|
}
|
|
err = yaml.Unmarshal(data, DefaultConfig)
|
|
if err != nil {
|
|
log.Printf("error: %v", err)
|
|
}
|
|
return DefaultConfig
|
|
}
|