Skip to content

Commit

Permalink
[config] refs #318 - Change LevelFromString call for LevelFromEnum
Browse files Browse the repository at this point in the history
  • Loading branch information
AntiD2ta committed Jan 26, 2020
1 parent 707401f commit ab0e150
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/coin/skycoin/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func RegisterConfig() error {

wltOpt := local.NewOption(string(wltSrc.id), []string{SettingPathToWalletSource}, false, string(wltSrcBytes))

level := map[string]string{"level": "warn"}
level := map[string]string{"level": strconv.Itoa(logging.Warning)}
levelBytes, err := json.Marshal(level)
if err != nil {
return err
Expand Down
5 changes: 3 additions & 2 deletions src/coin/skycoin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ func init() {
if err != nil {
logSkycoin.WithError(err).Warn("Couldn't unmarshal from options")
}
level, err := logging.LevelFromString(logSetting["level"])
level, err := logging.LevelFromEnum(logSetting["level"])
if err != nil {
logSkycoin.Warn("Couldn't get level from logging")
logSkycoin.Warn("Couldn't get level from logging ", logSetting["level"])
// TODO: Remove last param when feature is ok
logSkycoin.WithError(err).WithField("string", logSetting["level"]).Error()
} else {
logging.SetLevel(level)
Expand Down
2 changes: 1 addition & 1 deletion src/models/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func (cs *ConfigSection) saveOptionValue(opt string, path []string, name string,

if opt == "log" {
if name == "level" {
level, err := logging.LevelFromString(value)
level, err := logging.LevelFromEnum(value)
if err != nil {
log.WithError(err).Warn("%s is not a correct log level", value)
} else {
Expand Down

0 comments on commit ab0e150

Please sign in to comment.