mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
internal/debug: rename logOutputF -> logOutputFile. use io.WriteCloser
This commit is contained in:
parent
c9dc6d7658
commit
8ccc4eb5be
1 changed files with 3 additions and 8 deletions
|
|
@ -167,14 +167,9 @@ var Flags = []cli.Flag{
|
||||||
traceFlag,
|
traceFlag,
|
||||||
}
|
}
|
||||||
|
|
||||||
type writerCloser interface {
|
|
||||||
Write([]byte) (int, error)
|
|
||||||
Close() error
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
glogger *log.GlogHandler
|
glogger *log.GlogHandler
|
||||||
logOutputF writerCloser
|
logOutputFile io.WriteCloser
|
||||||
defaultTerminalHandler *log.TerminalHandler
|
defaultTerminalHandler *log.TerminalHandler
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -223,14 +218,14 @@ func Setup(ctx *cli.Context) error {
|
||||||
} else {
|
} else {
|
||||||
context = append(context, "location", filepath.Join(os.TempDir(), "geth-lumberjack.log"))
|
context = append(context, "location", filepath.Join(os.TempDir(), "geth-lumberjack.log"))
|
||||||
}
|
}
|
||||||
logOutputF = &lumberjack.Logger{
|
logOutputFile = &lumberjack.Logger{
|
||||||
Filename: logFile,
|
Filename: logFile,
|
||||||
MaxSize: ctx.Int(logMaxSizeMBsFlag.Name),
|
MaxSize: ctx.Int(logMaxSizeMBsFlag.Name),
|
||||||
MaxBackups: ctx.Int(logMaxBackupsFlag.Name),
|
MaxBackups: ctx.Int(logMaxBackupsFlag.Name),
|
||||||
MaxAge: ctx.Int(logMaxAgeFlag.Name),
|
MaxAge: ctx.Int(logMaxAgeFlag.Name),
|
||||||
Compress: ctx.Bool(logCompressFlag.Name),
|
Compress: ctx.Bool(logCompressFlag.Name),
|
||||||
}
|
}
|
||||||
output = io.MultiWriter(terminalOutput, logOutputF)
|
output = io.MultiWriter(terminalOutput, logOutputFile)
|
||||||
} else if logFile != "" {
|
} else if logFile != "" {
|
||||||
var err error
|
var err error
|
||||||
if logOutputF, err = os.OpenFile(logFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644); err != nil {
|
if logOutputF, err = os.OpenFile(logFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644); err != nil {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue