remove DefaultLevel, use the logger
Gitea/etcdmtr/pipeline/head This commit looks good Details

This commit is contained in:
dave 2024-03-02 19:43:21 -08:00
parent 20a027af93
commit 5f8061378a
2 changed files with 14 additions and 17 deletions

View File

@ -112,8 +112,7 @@ func main() {
logger := getLogger()
if args.Version {
fmt.Println("0.0.1")
os.Exit(0)
logger.Fatalc(1, "0.0.1")
}
if len(positionals) < 1 {
@ -153,7 +152,7 @@ func main() {
numMembers := len(members.Members)
fmt.Printf("found member list of: %d\n", numMembers)
logger.Info("found member list of: %d", numMembers)
memberErrors := make([]error, 0)

View File

@ -25,11 +25,10 @@ func (l LogLevel) String() string {
}
type ELog struct {
parent *ELog
name string
Level LogLevel
DefaultLevel LogLevel
Format *LogFormat
parent *ELog
name string
Level LogLevel
Format *LogFormat
}
type LogFormatTokenValue int64
@ -117,10 +116,9 @@ func NewRootLoggerWithFormat(format *LogFormat) *ELog {
func (e *ELog) GetLogger(name string) *ELog {
return &ELog{
parent: e,
name: name,
Level: e.Level,
DefaultLevel: e.DefaultLevel,
parent: e,
name: name,
Level: e.Level,
}
}
@ -166,10 +164,6 @@ func (e *ELog) _DoLog(level LogLevel, path []string, message string, a ...any) (
return fmt.Println(log.String())
}
func (e *ELog) Log(message string, a ...any) (n int, err error) {
return e._Log(e.DefaultLevel, message, a...)
}
func (e *ELog) Debug(message string, a ...any) (n int, err error) {
return e._Log(LOGLEVEL_DEBUG, message, a...)
}
@ -191,8 +185,12 @@ func (e *ELog) Critical(message string, a ...any) (n int, err error) {
}
func (e *ELog) Fatal(message string, a ...any) (n int, err error) {
return e.Fatalc(1, message, a...)
}
func (e *ELog) Fatalc(exitCode int, message string, a ...any) (n int, err error) {
_, _ = e._Log(LOGLEVEL_FATAL, message, a...)
os.Exit(1)
os.Exit(exitCode)
return 0, nil
}