deps: convert zap to slog (#2825)

This commit is contained in:
miampf 2024-02-08 14:20:01 +00:00 committed by GitHub
parent 3765cb0762
commit 54cce77bab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
182 changed files with 1474 additions and 1509 deletions

View file

@ -8,13 +8,14 @@ package main
import (
"flag"
"log/slog"
"os"
"github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/file"
"github.com/edgelesssys/constellation/v2/internal/logger"
"github.com/edgelesssys/constellation/v2/upgrade-agent/internal/server"
"github.com/spf13/afero"
"go.uber.org/zap"
)
const (
@ -26,23 +27,24 @@ func main() {
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
flag.Parse()
log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)).Named("bootstrapper")
defer log.Sync()
log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
if *gRPCDebug {
log.Named("gRPC").ReplaceGRPCLogger()
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
} else {
log.Named("gRPC").WithIncreasedLevel(zap.WarnLevel).ReplaceGRPCLogger()
logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(slog.LevelWarn, log.Handler())).WithGroup("gRPC"))
}
handler := file.NewHandler(afero.NewOsFs())
server, err := server.New(log, handler)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create update server")
log.With(slog.Any("error", err)).Error("Failed to create update server")
os.Exit(1)
}
err = server.Run(protocol, constants.UpgradeAgentSocketPath)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to start update server")
log.With(slog.Any("error", err)).Error("Failed to start update server")
os.Exit(1)
}
}