[main] [config] refs fibercrypto#298 - Add log level settings

simelo · Jan 5, 2020 · b956f08 · b956f08
1 parent 0b39a01
commit b956f08
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/coin/skycoin/config/config.go b/src/coin/skycoin/config/config.go
@@ -34,7 +34,7 @@ func getMultiPlatformUserDirectory() string {
 
 func RegisterConfig() error {
 	cm := local.GetConfigManager()
-	node := map[string]string{"address": "https://staging.node.skycoin.net"}
+	node := map[string]string{"address": "https://staging.node.skycoin.net", "level": "warn"}
 	nodeBytes, err := json.Marshal(node)
 	if err != nil {
 		return err
@@ -53,14 +53,14 @@ func RegisterConfig() error {
 
 	wltOpt := local.NewOption(string(wltSrc.id), []string{SettingPathToWalletSource}, false, string(wltSrcBytes))
 
-	level := map[string]string{"level": "Debug"}
-	levelBytes, err := json.Marshal(level)
-	if err != nil {
-		return err
-	}
-	logLevelOpt := local.NewOption(SettingPathToLog, []string{}, false, string(levelBytes))
+	// level := map[string]string{"level": "warn"}
+	// levelBytes, err := json.Marshal(level)
+	// if err != nil {
+	// 	return err
+	// }
+	// logLevelOpt := local.NewOption(SettingPathToNode, []string{}, false, string(levelBytes))
 
-	sectionManager = cm.RegisterSection(SectionName, []*local.Option{nodeOpt, wltOpt, logLevelOpt})
+	sectionManager = cm.RegisterSection(SectionName, []*local.Option{nodeOpt, wltOpt}) //, logLevelOpt})
 	return nil
 }
 

diff --git a/src/coin/skycoin/main.go b/src/coin/skycoin/main.go
@@ -20,6 +20,23 @@ func init() {
 	if err != nil {
 		logSkycoin.Warn("Couldn't register Skycoin configuration")
 	}
+
+	// logStr, err := config.GetOption(config.SettingPathToNode)
+	// if err != nil {
+	// 	logSkycoin.Warn("Couldn't get log options")
+	// 	logSkycoin.WithError(err).Error("AA")
+	// }
+	// log := make(map[string]string)
+	// err = json.Unmarshal([]byte(logStr), &log)
+	// if err != nil {
+	// 	logSkycoin.Warn("Couldn't unmarshal from options")
+	// }
+	// level, err := logging.LevelFromString(log["level"])
+	// if err != nil {
+	// 	logSkycoin.Warn("Couldn't get level from logging " + log["level"])
+	// }
+	// logging.SetLevel(level)
+
 	nodeStr, err := config.GetOption(config.SettingPathToNode)
 	if err != nil {
 		logSkycoin.Warn("Couldn't get node options")
@@ -29,6 +46,12 @@ func init() {
 	if err != nil {
 		logSkycoin.Warn("Couldn't unmarshal from options")
 	}
+	level, err := logging.LevelFromString(node["level"])
+	if err != nil {
+		logSkycoin.Warn("Couldn't get level from logging")
+		logSkycoin.WithError(err).WithField("string", node["level"]).Error()
+	}
+	logging.SetLevel(level)
 	err = core.GetMultiPool().CreateSection(sky.PoolSection, sky.NewSkycoinConnectionFactory(node["address"]))
 	if err != nil {
 		logSkycoin.Warn("Couldn't create section for Skycoin")