d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-02 23:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in UpdateConfig

Browse Source 
Fixes https://github.com/thrasher-/gocryptotrader/issues/124
This commit is contained in:
Adrian Gallagher
2018-05-09 22:11:16 +10:00
parent d882c1dff4
commit 981b600f91
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
config/config.go
View File

@@ -512,14 +512,9 @@ func (c *Config) SaveConfig(configPath string) error {
return nil
}
// LoadConfig loads your configuration file into your configuration object
func (c *Config) LoadConfig(configPath string) error {
err := c.ReadConfig(configPath)
if err != nil {
return fmt.Errorf(ErrFailureOpeningConfig, configPath, err)
}
err = c.CheckExchangeConfigValues()
// CheckConfig checks all config settings
func (c *Config) CheckConfig() error {
err := c.CheckExchangeConfigValues()
if err != nil {
return fmt.Errorf(ErrCheckingConfigValues, err)
}
@@ -568,29 +563,34 @@ func (c *Config) LoadConfig(configPath string) error {
return nil
}
// LoadConfig loads your configuration file into your configuration object
func (c *Config) LoadConfig(configPath string) error {
err := c.ReadConfig(configPath)
if err != nil {
return fmt.Errorf(ErrFailureOpeningConfig, configPath, err)
}
return c.CheckConfig()
}
// UpdateConfig updates the config with a supplied config file
func (c *Config) UpdateConfig(configPath string, newCfg Config) error {
if c.Name != newCfg.Name && newCfg.Name != "" {
c.Name = newCfg.Name
}
err := newCfg.CheckExchangeConfigValues()
err := newCfg.CheckConfig()
if err != nil {
return err
}
c.Exchanges = newCfg.Exchanges
if c.CurrencyPairFormat != newCfg.CurrencyPairFormat {
c.CurrencyPairFormat = newCfg.CurrencyPairFormat
}
c.Name = newCfg.Name
c.EncryptConfig = newCfg.EncryptConfig
c.Cryptocurrencies = newCfg.Cryptocurrencies
c.CurrencyExchangeProvider = newCfg.CurrencyExchangeProvider
c.CurrencyPairFormat = newCfg.CurrencyPairFormat
c.FiatDisplayCurrency = newCfg.FiatDisplayCurrency
c.GlobalHTTPTimeout = newCfg.GlobalHTTPTimeout
c.Portfolio = newCfg.Portfolio
err = newCfg.CheckSMSGlobalConfigValues()
if err != nil {
return err
}
c.SMS = newCfg.SMS
c.Webserver = newCfg.Webserver
c.Exchanges = newCfg.Exchanges
err = c.SaveConfig(configPath)
if err != nil {