Ver Fonte

cmd/syncthing, lib/logger: Add date to default log format (fixes #8272) (#8273)

This changes the default log format to include the date.
Jakob Borg há 3 anos atrás
pai
commit
61dffabf97
2 ficheiros alterados com 5 adições e 5 exclusões
  1. 4 4
      cmd/syncthing/main.go
  2. 1 1
      lib/logger/logger.go

+ 4 - 4
cmd/syncthing/main.go

@@ -68,9 +68,9 @@ The --logflags value is a sum of the following:
    8  Long filename
    8  Long filename
   16  Short filename
   16  Short filename
 
 
-I.e. to prefix each log line with date and time, set --logflags=3 (1 + 2 from
-above). The value 0 is used to disable all of the above. The default is to
-show time only (2).
+I.e. to prefix each log line with time and filename, set --logflags=18 (2 + 16
+from above). The value 0 is used to disable all of the above. The default is
+to show date and time (3).
 
 
 Logging always happens to the command line (stdout) and optionally to the
 Logging always happens to the command line (stdout) and optionally to the
 file at the path specified by --logfile=path. In addition to an path, the special
 file at the path specified by --logfile=path. In addition to an path, the special
@@ -187,7 +187,7 @@ type serveOptions struct {
 func defaultVars() kong.Vars {
 func defaultVars() kong.Vars {
 	vars := kong.Vars{}
 	vars := kong.Vars{}
 
 
-	vars["logFlags"] = strconv.Itoa(log.Ltime)
+	vars["logFlags"] = strconv.Itoa(logger.DefaultFlags)
 	vars["logMaxSize"] = strconv.Itoa(10 << 20) // 10 MiB
 	vars["logMaxSize"] = strconv.Itoa(10 << 20) // 10 MiB
 	vars["logMaxFiles"] = "3"                   // plus the current one
 	vars["logMaxFiles"] = "3"                   // plus the current one
 
 

+ 1 - 1
lib/logger/logger.go

@@ -31,7 +31,7 @@ const (
 )
 )
 
 
 const (
 const (
-	DefaultFlags = log.Ltime
+	DefaultFlags = log.Ltime | log.Ldate
 	DebugFlags   = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
 	DebugFlags   = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
 )
 )