diff --git a/config/config.go b/config/config.go index dc968702..f485fe99 100644 --- a/config/config.go +++ b/config/config.go @@ -9,16 +9,9 @@ import ( yaml "gopkg.in/yaml.v2" ) -var ( - // DefaultConfigPath : path to the default config file (please do not change it) - DefaultConfigPath = "config/default_config.yml" - // ConfigPath : path to the user specific config file (please do not change it) - ConfigPath = "config/config.yml" -) - var config *Config var once sync.Once -var configpaths = []string{DefaultConfigPath, ConfigPath} +var Configpaths = []string{"config/default_config.yml", "config/config.yml"} func Get() *Config { once.Do(func() { @@ -60,13 +53,13 @@ func init() { // Reload the configuration from the files provided in the config variables func Reload() { - configor.Load(Get(), configpaths...) + configor.Load(Get(), Configpaths...) } // BindFlags returns a function which is to be used after // flag.Parse to check and copy the flags' values to the Config instance. func BindFlags() func() { - confFile := flag.String("conf", ConfigPath, "path to the configuration file") + confFile := flag.String("conf", Configpaths[1], "path to the configuration file") flag.StringVar(&Get().DBType, "dbtype", Get().DBType, "database backend") flag.StringVar(&Get().Host, "host", Get().Host, "binding address of the server") flag.IntVar(&Get().Port, "port", Get().Port, "port of the server") @@ -74,7 +67,7 @@ func BindFlags() func() { flag.StringVar(&Get().DBLogMode, "dblogmode", Get().DBLogMode, "database log verbosity (errors only by default)") return func() { if *confFile != "" { - configpaths = append(configpaths, *confFile) + Configpaths = append(Configpaths, *confFile) Reload() } } diff --git a/config/config_test.go b/config/config_test.go index 5c7c777f..a9d3aa8a 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -10,8 +10,7 @@ import ( ) var _ = func() (_ struct{}) { - ConfigPath = "config.yml" - DefaultConfigPath = "default_config.yml" + Configpaths = []string{"config.yml", "default_config.yml"} Reload() return }() diff --git a/models/gorm_test.go b/models/gorm_test.go index 68fd4bef..fbba1c34 100644 --- a/models/gorm_test.go +++ b/models/gorm_test.go @@ -11,8 +11,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", config.Configpaths[0]) config.Reload() return }() diff --git a/templates/template_functions_test.go b/templates/template_functions_test.go index 316d059a..2e7124ec 100644 --- a/templates/template_functions_test.go +++ b/templates/template_functions_test.go @@ -21,8 +21,8 @@ import ( // run before router/init.go:init() var _ = func() (_ struct{}) { gin.SetMode(gin.TestMode) - config.ConfigPath = path.Join("..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", config.Configpaths[0]) config.Reload() categories.InitCategories() return diff --git a/templates/template_test.go b/templates/template_test.go index b104de76..a020968f 100644 --- a/templates/template_test.go +++ b/templates/template_test.go @@ -26,8 +26,8 @@ import ( // run before router/init.go:init() var _ = func() (_ struct{}) { gin.SetMode(gin.TestMode) - config.ConfigPath = path.Join("..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", config.Configpaths[0]) config.Reload() return }() diff --git a/utils/categories/categories_test.go b/utils/categories/categories_test.go index df6283da..d4ea7d37 100644 --- a/utils/categories/categories_test.go +++ b/utils/categories/categories_test.go @@ -13,8 +13,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", config.Configpaths[0]) config.Reload() return }() diff --git a/utils/format/format_test.go b/utils/format/format_test.go index 3a1bd51e..6ea509fb 100644 --- a/utils/format/format_test.go +++ b/utils/format/format_test.go @@ -11,8 +11,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", config.Configpaths[0]) config.Reload() return }() diff --git a/utils/publicSettings/publicSettings_test.go b/utils/publicSettings/publicSettings_test.go index 7281f42e..d1eed9d4 100644 --- a/utils/publicSettings/publicSettings_test.go +++ b/utils/publicSettings/publicSettings_test.go @@ -17,8 +17,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", config.Configpaths[0]) config.Reload() return }() diff --git a/utils/search/structs/structs_test.go b/utils/search/structs/structs_test.go index 9173da2d..c34ef1d9 100644 --- a/utils/search/structs/structs_test.go +++ b/utils/search/structs/structs_test.go @@ -12,8 +12,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", "..", config.Configpaths[0]) config.Reload() categories.InitCategories() return diff --git a/utils/torrentLanguages/torrent_languages_test.go b/utils/torrentLanguages/torrent_languages_test.go index 6f81c9f7..547492ae 100644 --- a/utils/torrentLanguages/torrent_languages_test.go +++ b/utils/torrentLanguages/torrent_languages_test.go @@ -14,8 +14,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", config.Configpaths[0]) config.Reload() config.Get().I18n.Directory = path.Join("..", "..", config.Get().I18n.Directory) return diff --git a/utils/validator/torrent/functions_test.go b/utils/validator/torrent/functions_test.go index 192240d1..72ec1d89 100644 --- a/utils/validator/torrent/functions_test.go +++ b/utils/validator/torrent/functions_test.go @@ -13,8 +13,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", "..", config.Configpaths[0]) config.Reload() config.Get().I18n.Directory = path.Join("..", "..", "..", config.Get().I18n.Directory) categories.InitCategories() diff --git a/utils/validator/validator_test.go b/utils/validator/validator_test.go index dfa5c6d0..e8ed72b1 100644 --- a/utils/validator/validator_test.go +++ b/utils/validator/validator_test.go @@ -12,8 +12,8 @@ import ( // run before config/parse.go:init() var _ = func() (_ struct{}) { - config.ConfigPath = path.Join("..", "..", config.ConfigPath) - config.DefaultConfigPath = path.Join("..", "..", config.DefaultConfigPath) + config.Configpaths[1] = path.Join("..", "..", config.Configpaths[1]) + config.Configpaths[0] = path.Join("..", "..", config.Configpaths[0]) config.Reload() return }()