PenaSide/customer
3
0
Fork 0
generated from PenaSide/GolangTemplate
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Pasha 2024-11-27 13:11:44 +03:00
parent d4c2e2d6ce
commit c6fa06b6cf
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/app/main.go
View File

@ -46,8 +46,6 @@ func main() {
fmt.Println("env configuration: \n", string(configJSON)) fmt.Println("env configuration: \n", string(configJSON))
fmt.Println(config)
if err := app.Run(config, logger, app.Build{ if err := app.Run(config, logger, app.Build{
Commit: commit, Commit: commit,
Version: version, Version: version,

20
internal/app/app.go
View File

@ -7,7 +7,9 @@ import (
"gitea.pena/PenaSide/common/mongo" "gitea.pena/PenaSide/common/mongo"
"gitea.pena/PenaSide/customer/internal/interface/controller/http" "gitea.pena/PenaSide/customer/internal/interface/controller/http"
"gitea.pena/PenaSide/trashlog/app" "gitea.pena/PenaSide/trashlog/app"
"gitea.pena/PenaSide/trashlog/wrappers/zaptrashlog"
"github.com/themakers/hlog" "github.com/themakers/hlog"
"go.uber.org/zap/zapcore"
tb "gopkg.in/tucnak/telebot.v2" tb "gopkg.in/tucnak/telebot.v2"
"os/signal" "os/signal"
"syscall" "syscall"
@ -45,18 +47,16 @@ func Run(config *models.Config, logger *zap.Logger, build Build) (appErr error)
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer cancel() defer cancel()
//clickHouseLogger, err := zaptrashlog.NewCore(ctx, zap.InfoLevel, config.TrashLogHost, build.Version, build.Commit, build.BuildTime) clickHouseLogger, err := zaptrashlog.NewCore(ctx, zap.InfoLevel, config.TrashLogHost, build.Version, build.Commit, build.BuildTime)
//if err != nil { if err != nil {
// panic(err) panic(err)
//} }
var err error loggerForHlog := logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core {
return zapcore.NewTee(core, clickHouseLogger)
}), zap.AddCallerSkip(2))
//loggerForHlog := logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core { loggerHlog := hlog.New(loggerForHlog).Module(config.ModuleLogger)
// return zapcore.NewTee(core, clickHouseLogger)
//}), zap.AddCallerSkip(2))
loggerHlog := hlog.New(logger).Module(config.ModuleLogger)
loggerHlog.With(models.AllFields{}) loggerHlog.With(models.AllFields{})
loggerHlog.Emit(app.InfoSvcStarted{}) loggerHlog.Emit(app.InfoSvcStarted{})