3333 Name : "log.json" ,
3434 Usage : "Format logs with JSON" ,
3535 }
36- backtraceAtFlag = cli.StringFlag {
37- Name : "log.backtrace" ,
38- Usage : "Request a stack trace at a specific logging statement (e.g. \" block.go:271\" )" ,
39- Value : "" ,
40- }
41- debugFlag = cli.BoolFlag {
42- Name : "log.debug" ,
43- Usage : "Prepends log messages with call-site location (file and line number)" ,
44- }
4536 pprofFlag = cli.BoolFlag {
4637 Name : "pprof" ,
4738 Usage : "Enable the pprof HTTP server" ,
7768
7869// Flags holds all command-line flags required for debugging.
7970var Flags = []cli.Flag {
80- & backtraceAtFlag ,
8171 & blockprofilerateFlag ,
8272 & cpuprofileFlag ,
83- & debugFlag ,
8473 & logjsonFlag ,
8574 & memprofilerateFlag ,
8675 & pprofAddrFlag ,
@@ -94,43 +83,33 @@ var Flags = []cli.Flag{
9483var glogger * log.GlogHandler
9584
9685func init () {
97- glogger = log .NewGlogHandler (log .StreamHandler (os .Stderr , log .TerminalFormat (false )))
86+ terminalOutput := io .Writer (os .Stderr )
87+ glogger := log .NewGlogHandler (log .NewTerminalHandler (terminalOutput , false ))
9888 glogger .Verbosity (log .LvlInfo )
99- log .Root (). SetHandler (glogger )
89+ log .SetDefault ( log . NewLogger (glogger ) )
10090}
10191
10292// Setup initializes profiling and logging based on the CLI flags.
10393// It should be called as early as possible in the program.
10494func Setup (ctx * cli.Context ) error {
105- var ostream log.Handler
10695 output := io .Writer (os .Stderr )
10796 if ctx .Bool (logjsonFlag .Name ) {
108- ostream = log .StreamHandler ( output , log .JSONFormat ( ))
97+ glogger = log .NewGlogHandler ( log .JSONHandler ( output ))
10998 } else {
11099 usecolor := (isatty .IsTerminal (os .Stderr .Fd ()) || isatty .IsCygwinTerminal (os .Stderr .Fd ())) && os .Getenv ("TERM" ) != "dumb"
111100 if usecolor {
112101 output = colorable .NewColorableStderr ()
113102 }
114- ostream = log .StreamHandler ( output , log .TerminalFormat ( usecolor ))
103+ glogger = log .NewGlogHandler ( log .NewTerminalHandler ( output , usecolor ))
115104 }
116- glogger .SetHandler (ostream )
117105
118106 // logging
119107 verbosity := ctx .Int (verbosityFlag .Name )
120- glogger .Verbosity (log .Lvl (verbosity ))
108+ glogger .Verbosity (log .FromLegacyLevel (verbosity ))
121109 vmodule := ctx .String (vmoduleFlag .Name )
122110 glogger .Vmodule (vmodule )
123111
124- debug := ctx .Bool (debugFlag .Name )
125- if ctx .IsSet (debugFlag .Name ) {
126- debug = ctx .Bool (debugFlag .Name )
127- }
128- log .PrintOrigins (debug )
129-
130- backtrace := ctx .String (backtraceAtFlag .Name )
131- glogger .BacktraceAt (backtrace )
132-
133- log .Root ().SetHandler (glogger )
112+ log .SetDefault (log .NewLogger (glogger ))
134113
135114 // profiling, tracing
136115 runtime .MemProfileRate = memprofilerateFlag .Value
0 commit comments