SQuiz/core
2
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

drop second logger

Browse Source
This commit is contained in:
Pavel 2024-11-01 11:24:03 +03:00
parent da9c292adf
commit 5988d677de
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/main.go
View File

@ -2,8 +2,8 @@ package main
import (
"context"
"fmt"
"go.uber.org/zap"
"log"
"os"
"os/signal"
"penahub.gitlab.yandexcloud.net/backend/quiz/core/internal/app"
@ -18,24 +18,18 @@ var (
)
func main() {
logger, err := zap.NewProduction()
if err != nil {
fmt.Printf("Failed to initialize logger: %v\n", err)
os.Exit(1)
}
config, err := initialize.LoadConfig()
if err != nil {
logger.Fatal("Failed to load config", zap.Error(err))
log.Fatal("Failed to load config", zap.Error(err))
}
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer stop()
if err = app.Run(ctx, *config, logger, app.Build{
if err = app.Run(ctx, *config, app.Build{
Commit: commit,
Version: version,
}); err != nil {
logger.Fatal("App exited with error", zap.Error(err))
log.Fatal("App exited with error", zap.Error(err))
}
}

25
internal/app/app.go
View File

@ -4,6 +4,7 @@ import (
"context"
"errors"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/log"
"github.com/themakers/hlog"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
@ -32,7 +33,7 @@ var zapOptions = []zap.Option{
zap.AddStacktrace(zap.ErrorLevel),
}
func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build Build) error {
func Run(ctx context.Context, cfg initialize.Config, build Build) error {
var (
err error
zapLogger *zap.Logger
@ -40,7 +41,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
defer func() {
if r := recover(); r != nil {
logger.Error("Recovered from a panic", zap.Any("error", r))
log.Error("Recovered from a panic", zap.Any("error", r))
}
}()
@ -82,7 +83,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
dalS, err := initialize.NewDALs(ctx, cfg)
if err != nil {
logger.Error("Error initializing dals", zap.Error(err))
zapLogger.Error("Error initializing dals", zap.Error(err))
return err
}
@ -92,7 +93,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
KafkaTopic: cfg.KafkaTopic,
})
if err != nil {
logger.Error("Error initializing kafka", zap.Error(err))
zapLogger.Error("Error initializing kafka", zap.Error(err))
return err
}
@ -103,7 +104,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
redisClient, err := initialize.Redis(ctx, cfg)
if err != nil {
logger.Error("Error initializing redis", zap.Error(err))
zapLogger.Error("Error initializing redis", zap.Error(err))
return err
}
@ -115,7 +116,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
clients, err := initialize.NewClients(ctx, cfg, dalS.PgDAL)
if err != nil {
logger.Error("Error initializing clients", zap.Error(err))
zapLogger.Error("Error initializing clients", zap.Error(err))
return err
}
@ -138,13 +139,13 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
grpc, err := server.NewGRPC(zapLogger)
if err != nil {
logger.Error("Error initializing grpc", zap.Error(err))
zapLogger.Error("Error initializing grpc", zap.Error(err))
return err
}
grpc.Register(controllers.GRpcControllers)
srv := http.NewServer(http.ServerConfig{
Logger: logger,
Logger: zapLogger,
Controllers: []http.Controller{controllers.HttpControllers.Account, controllers.HttpControllers.Telegram, controllers.HttpControllers.Result,
controllers.HttpControllers.Question, controllers.HttpControllers.Quiz, controllers.HttpControllers.Statistic},
Hlogger: loggerHlog,
@ -152,7 +153,7 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
go func() {
if err := srv.Start(cfg.HttpHost + ":" + cfg.NumberPort); err != nil {
logger.Error("HTTP server startup error", zap.Error(err))
zapLogger.Error("HTTP server startup error", zap.Error(err))
cancel()
}
}()
@ -175,13 +176,13 @@ func Run(ctx context.Context, cfg initialize.Config, logger *zap.Logger, build B
defer timeoutCancel()
if err := shutdownGroup.Call(timeoutCtx); err != nil {
if errors.Is(err, context.DeadlineExceeded) {
logger.Error("Shutdown timed out", zap.Error(err))
zapLogger.Error("Shutdown timed out", zap.Error(err))
} else {
logger.Error("Failed to shutdown services gracefully", zap.Error(err))
zapLogger.Error("Failed to shutdown services gracefully", zap.Error(err))
}
return err
}
logger.Info("Application has stopped")
zapLogger.Info("Application has stopped")
return nil
}