78cff9e3a4
- logjson flag remove logformat flag - passed to eth Config - logsystem not a field of Ethereum - LogSystem does not need to expose GetLogLevel/SetLogLevel - message struct just implements more generic LogMsg interface - LogMsg is a fmt.Stringer with Level() - jsonMsg ([]byte) implements LogMsg - remove "raw" systems - move level logic inside StdLogSystem - logsystems only print their kind of msg: jsonLogSystem prints jsonMsg, StdLogSystem prints stdMsg
50 lines
958 B
Go
50 lines
958 B
Go
package logger
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"os"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
)
|
|
|
|
func openLogFile(datadir string, filename string) *os.File {
|
|
path := common.AbsolutePath(datadir, filename)
|
|
file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
|
|
if err != nil {
|
|
panic(fmt.Sprintf("error opening log file '%s': %v", filename, err))
|
|
}
|
|
return file
|
|
}
|
|
|
|
func New(datadir string, logFile string, logLevel int) LogSystem {
|
|
var writer io.Writer
|
|
if logFile == "" {
|
|
writer = os.Stdout
|
|
} else {
|
|
writer = openLogFile(datadir, logFile)
|
|
}
|
|
|
|
var sys LogSystem
|
|
sys = NewStdLogSystem(writer, log.LstdFlags, LogLevel(logLevel))
|
|
AddLogSystem(sys)
|
|
|
|
return sys
|
|
}
|
|
|
|
func NewJSONsystem(datadir string, logFile string) LogSystem {
|
|
var writer io.Writer
|
|
if logFile == "-" {
|
|
writer = os.Stdout
|
|
} else {
|
|
writer = openLogFile(datadir, logFile)
|
|
}
|
|
|
|
var sys LogSystem
|
|
sys = NewJsonLogSystem(writer)
|
|
AddLogSystem(sys)
|
|
|
|
return sys
|
|
}
|