Преглед изворни кода

Set log level of std logger as well. (since gui logging is disabled)

obscuren пре 11 година
родитељ
комит
5ac875b097
4 измењених фајлова са 12 додато и 4 уклоњено
  1. 3 1
      ethereal/gui.go
  2. 2 1
      ethereal/main.go
  3. 1 0
      ethereum/main.go
  4. 6 2
      utils/cmd.go

+ 3 - 1
ethereal/gui.go

@@ -56,7 +56,8 @@ type Gui struct {
 
 	plugins map[string]plugin
 
-	miner *ethminer.Miner
+	miner  *ethminer.Miner
+	stdLog ethlog.LogSystem
 }
 
 // Create GUI, but doesn't start it
@@ -559,6 +560,7 @@ func (gui *Gui) ToggleTurboMining() {
 // functions that allow Gui to implement interface ethlog.LogSystem
 func (gui *Gui) SetLogLevel(level ethlog.LogLevel) {
 	gui.logLevel = level
+	gui.stdLog.SetLogLevel(level)
 	gui.config.Save("loglevel", level)
 }
 

+ 2 - 1
ethereal/main.go

@@ -25,7 +25,7 @@ func run() error {
 
 	utils.InitDataDir(Datadir)
 
-	utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile)
+	stdLog := utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile)
 
 	db := utils.NewDatabase()
 	err := utils.DBSanityCheck(db)
@@ -53,6 +53,7 @@ func run() error {
 	}
 
 	gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel)
+	gui.stdLog = stdLog
 
 	utils.RegisterInterrupt(func(os.Signal) {
 		gui.Stop()

+ 1 - 0
ethereum/main.go

@@ -43,6 +43,7 @@ func main() {
 	err := utils.DBSanityCheck(db)
 	if err != nil {
 		logger.Errorln(err)
+
 		os.Exit(1)
 	}
 

+ 6 - 2
utils/cmd.go

@@ -100,18 +100,22 @@ func InitDataDir(Datadir string) {
 	}
 }
 
-func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string) {
+func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string) ethlog.LogSystem {
 	var writer io.Writer
 	if LogFile == "" {
 		writer = os.Stdout
 	} else {
 		writer = openLogFile(Datadir, LogFile)
 	}
-	ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.LogLevel(LogLevel)))
+
+	sys := ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.LogLevel(LogLevel))
+	ethlog.AddLogSystem(sys)
 	if DebugFile != "" {
 		writer = openLogFile(Datadir, DebugFile)
 		ethlog.AddLogSystem(ethlog.NewStdLogSystem(writer, log.LstdFlags, ethlog.DebugLevel))
 	}
+
+	return sys
 }
 
 func InitConfig(ConfigFile string, Datadir string, EnvPrefix string) *ethutil.ConfigManager {