Browse Source

cmd/syncthing, lib/logger: Set debug flags on SetDebug for tests

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4187
Simon Frei 8 years ago
parent
commit
719c313b23
2 changed files with 4 additions and 1 deletions
  1. 1 1
      cmd/syncthing/main.go
  2. 3 0
      lib/logger/logger.go

+ 1 - 1
cmd/syncthing/main.go

@@ -269,7 +269,7 @@ func defaultRuntimeOptions() RuntimeOptions {
 	}
 
 	if os.Getenv("STTRACE") != "" {
-		options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
+		options.logFlags = logger.DebugFlags
 	}
 
 	if runtime.GOOS != "windows" {

+ 3 - 0
lib/logger/logger.go

@@ -28,6 +28,8 @@ const (
 	NumLevels
 )
 
+const DebugFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
+
 // A MessageHandler is called with the log level and message text.
 type MessageHandler func(l LogLevel, msg string)
 
@@ -215,6 +217,7 @@ func (l *logger) SetDebug(facility string, enabled bool) {
 	l.mut.Lock()
 	l.debug[facility] = enabled
 	l.mut.Unlock()
+	l.SetFlags(DebugFlags)
 }
 
 // FacilityDebugging returns the set of facilities that have debugging