mirror of
https://git.mills.io/kayos/bitraft.git
synced 2024-06-25 16:28:53 +00:00
Logging: finish replacing logger
This commit is contained in:
parent
72936c494e
commit
e72e067e4d
21
main.go
21
main.go
@ -6,7 +6,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/hashicorp/go-sockaddr/template"
|
"github.com/hashicorp/go-sockaddr/template"
|
||||||
log "github.com/sirupsen/logrus"
|
"github.com/rs/zerolog"
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
flag "github.com/spf13/pflag"
|
flag "github.com/spf13/pflag"
|
||||||
"github.com/tidwall/finn"
|
"github.com/tidwall/finn"
|
||||||
)
|
)
|
||||||
@ -49,9 +50,9 @@ func main() {
|
|||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
if debug {
|
if debug {
|
||||||
log.SetLevel(log.DebugLevel)
|
zerolog.SetGlobalLevel(zerolog.DebugLevel)
|
||||||
} else {
|
} else {
|
||||||
log.SetLevel(log.InfoLevel)
|
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
||||||
}
|
}
|
||||||
|
|
||||||
if version {
|
if version {
|
||||||
@ -62,7 +63,7 @@ func main() {
|
|||||||
if parseSnapshot != "" {
|
if parseSnapshot != "" {
|
||||||
err := WriteRedisCommandsFromSnapshot(os.Stdout, parseSnapshot)
|
err := WriteRedisCommandsFromSnapshot(os.Stdout, parseSnapshot)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warningf("%v", err)
|
log.Warn().Err(err).Msg("failed to parse snapshot")
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
@ -71,7 +72,7 @@ func main() {
|
|||||||
var lconsistency finn.Level
|
var lconsistency finn.Level
|
||||||
switch strings.ToLower(consistency) {
|
switch strings.ToLower(consistency) {
|
||||||
default:
|
default:
|
||||||
log.Warningf("invalid --consistency")
|
log.Warn().Msg("invalid --consistency")
|
||||||
case "low":
|
case "low":
|
||||||
lconsistency = finn.Low
|
lconsistency = finn.Low
|
||||||
case "medium", "med":
|
case "medium", "med":
|
||||||
@ -83,7 +84,7 @@ func main() {
|
|||||||
var ldurability finn.Level
|
var ldurability finn.Level
|
||||||
switch strings.ToLower(durability) {
|
switch strings.ToLower(durability) {
|
||||||
default:
|
default:
|
||||||
log.Warningf("invalid --durability")
|
log.Warn().Msg("invalid --durability")
|
||||||
case "low":
|
case "low":
|
||||||
ldurability = finn.Low
|
ldurability = finn.Low
|
||||||
case "medium", "med":
|
case "medium", "med":
|
||||||
@ -99,16 +100,16 @@ func main() {
|
|||||||
mustParse := func(addr string) string {
|
mustParse := func(addr string) string {
|
||||||
r, err := template.Parse(addr)
|
r, err := template.Parse(addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithError(err).Fatalf("error parsing addr %s: %s", addr, err)
|
log.Fatal().Err(err).Msgf("error parsing addr %s: %s", addr, err)
|
||||||
}
|
}
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
log.WithField("bind", bind).Debug("bind raw")
|
log.Debug().Str("bind", bind).Msg("bind raw")
|
||||||
bind = mustParse(bind)
|
bind = mustParse(bind)
|
||||||
log.WithField("bind", bind).Debug("bind parsed")
|
log.Debug().Str("bind", bind).Msg("bind parsed")
|
||||||
|
|
||||||
if err := ListenAndServe(bind, join, dir, logdir, lconsistency, ldurability); err != nil {
|
if err := ListenAndServe(bind, join, dir, logdir, lconsistency, ldurability); err != nil {
|
||||||
log.Warningf("%v", err)
|
log.Warn().Msgf("%v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user