ston1th/docstore
1
1
Fork 0
Code Issues 3 Releases Activity

added better logging

Browse source
This commit is contained in:
ston1th 2022-09-21 20:48:29 +02:00
commit 118cfd91de
86 changed files with 3774 additions and 8455 deletions
Download patch file Download diff file Expand all files Collapse all files

62
pkg/cmd/cmd.go
View file

@ -10,7 +10,6 @@ import (
"os"
"os/signal"
"path/filepath"
"strconv"
"syscall"
"git.giftfish.de/ston1th/docstore/pkg/core"
@ -19,9 +18,11 @@ import (
"git.giftfish.de/ston1th/docstore/pkg/server"
"git.giftfish.de/ston1th/godrop/v2"
"github.com/go-logr/logr"
"github.com/go-logr/zerologr"
"github.com/rs/zerolog"
"github.com/urfave/cli"
"k8s.io/klog/v2"
"k8s.io/klog/v2/klogr"
//"github.com/go-logr/zerologr"
//"github.com/rs/zerolog"
)
const (
@ -74,10 +75,12 @@ func initServer(cfg *core.Config) (err error) {
return
}
log, err := logFileLogger(cfg)
ll, err := logFileLogger(cfg)
if err != nil {
return
}
log := ll.WithName("main")
log.Info("starting docstore", "version", cfg.Version)
cfg.DataDir = filepath.Join(cfg.RunDir, core.DataDir)
debugCfg := new(core.Config)
@ -85,7 +88,7 @@ func initServer(cfg *core.Config) (err error) {
debugCfg.Secret = "[redacted]"
log.V(2).Info("docstore config", "cfg", debugCfg)
scanner, err := scan.New(log.WithName("scanner"), cfg)
scanner, err := scan.New(ll.WithName("scanner"), cfg)
if err != nil {
return errors.New("scanner: " + err.Error())
}
@ -98,12 +101,11 @@ func initServer(cfg *core.Config) (err error) {
return
}
srv := server.NewHTTPServer(log, cfg, l, scanner)
srv := server.NewHTTPServer(ll, cfg, l, scanner)
err = srv.Start()
if err != nil {
return
}
log.Info("docstore started", "version", cfg.Version)
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
<-sigs
@ -129,7 +131,8 @@ func loadConfig() error {
return err
}
if config.Debug {
zerolog.SetGlobalLevel(zerolog.TraceLevel)
new(klog.Level).Set("2")
//zerolog.SetGlobalLevel(zerolog.TraceLevel)
}
if config.RunDir == "" {
config.RunDir = defRunDir
@ -165,7 +168,7 @@ func fatal(err error) {
var (
log logr.Logger
zl zerolog.Logger
//zl zerolog.Logger
)
func logFileLogger(cfg *core.Config) (l logr.Logger, err error) {
@ -173,30 +176,31 @@ func logFileLogger(cfg *core.Config) (l logr.Logger, err error) {
if err != nil {
return
}
zln := zl.Output(f)
l = zerologr.New(&zln)
klog.LogToStderr(false)
klog.SetOutput(f)
l = klogr.New()
//zln := zl.Output(f)
//l = zerologr.New(&zln)
return
}
func init() {
//zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMs
zerolog.CallerMarshalFunc = func(pc uintptr, file string, line int) string {
short := file
for i := len(file) - 1; i > 0; i-- {
if file[i] == '/' {
short = file[i+1:]
break
}
}
file = short
return file + ":" + strconv.Itoa(line)
}
//zerologr.NameFieldName = "logger"
//zerologr.NameSeparator = "/"
zerologr.VerbosityFieldName = ""
zl = zerolog.New(os.Stderr)
zl = zl.With().Caller().Timestamp().Logger()
log = zerologr.New(&zl)
//zerolog.CallerMarshalFunc = func(pc uintptr, file string, line int) string {
// short := file
// for i := len(file) - 1; i > 0; i-- {
// if file[i] == '/' {
// short = file[i+1:]
// break
// }
// }
// file = short
// return file + ":" + strconv.Itoa(line)
//}
//zerologr.VerbosityFieldName = ""
//zl = zerolog.New(os.Stderr)
//zl = zl.With().Caller().Timestamp().Logger()
//log = zerologr.New(&zl)
log = klogr.New()
}
func Run(version string) {

2
pkg/server/server.go
View file

@ -90,7 +90,7 @@ func (s *HTTPServer) Start() (err error) {
}
go func() {
err = s.srv.Serve(s.listener)
if err != nil {
if err != nil && err != http.ErrServerClosed {
log.Error(err, "http server error")
}
}()