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

delete module logger env

Browse Source
This commit is contained in:
Pasha 2024-11-28 17:02:29 +03:00
parent 728414d5c3
commit 2086bb1ecd
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/validator/main.go
View File

@ -115,7 +115,6 @@ func loadConfig() (*models.Config, error) {
TemplategenMicroserviceURL: os.Getenv("TEMPLATEGEN_MICROSERVICE_URL"),
CodewordMicroservice: os.Getenv("CODEWORD_MICROSERVICE_GRPC_HOST"),
TrashLogHost: os.Getenv("TRASH_LOG_HOST"),
ModuleLogger: os.Getenv("MODULE_LOGGER"),
NotificationBotToken: os.Getenv("NOTIFICATION_BOT_TOKEN"),
NotificationRsPayChannel: envToInt64(os.Getenv("NOTIFICATION_RS_PAY_CHANNEL")),
NotificationChannel: envToInt64(os.Getenv("NOTIFICATION_CHANNEL")),
@ -227,10 +226,6 @@ func validateEncryptKeys(e *encrypt.Encrypt) error {
}
func validateNotEmpty(config *models.Config) error {
// todo подумать как не передавать имя логгера
if config.ModuleLogger == "" {
return fmt.Errorf("ModuleLogger is empty")
}
if config.ExternalCfg.EncryptCommon.PrivKey == "" {
return fmt.Errorf("invalid private encrypt key")
}

1
cmd/validator/main_test.go
View File

@ -130,7 +130,6 @@ func TestLoadConfig(t *testing.T) {
"MAIL_SENDER": "noreply@mailing.pena.digital",
"MAIL_API_KEY": "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev",
"MAIL_ADDRESS": "mail@mail.com",
"MODULE_LOGGER": "local-customer",
"NOTIFICATION_BOT_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg",
"NOTIFICATION_CHANNEL": "-1002177203276",
"NOTIFICATION_RS_PAY_CHANNEL": "-1002177203276",

1
deployments/staging/docker-compose.yaml
View File

@ -49,7 +49,6 @@ services:
- ENCRYPT_PRIVATE_KEY=$USER_PRIVATEKEY
- ADMIN_FRONT_URL=https://sadmin.pena
- TRASH_LOG_HOST=10.8.0.15:7113
- MODULE_LOGGER=customer-staging
- NOTIFICATION_BOT_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
ports:
- 10.8.0.6:8067:8065

6
internal/app/app.go
View File

@ -56,7 +56,7 @@ func Run(config *models.Config, logger *zap.Logger, build Build) (appErr error)
return zapcore.NewTee(core, clickHouseLogger)
}), zap.AddCallerSkip(2))
loggerHlog := hlog.New(loggerForHlog).Module(config.ModuleLogger)
loggerHlog := hlog.New(loggerForHlog).Module(models.ModuleLogger)
loggerHlog.With(models.AllFields{})
loggerHlog.Emit(app.InfoSvcStarted{})
@ -107,11 +107,11 @@ func Run(config *models.Config, logger *zap.Logger, build Build) (appErr error)
return err
}
if _, err = notificationBot.Send(tb.ChatID(config.NotificationRsPayChannel), fmt.Sprintf("PING MSG from %s", config.ModuleLogger)); err != nil {
if _, err = notificationBot.Send(tb.ChatID(config.NotificationRsPayChannel), fmt.Sprintf("PING MSG from %s", models.ModuleLogger)); err != nil {
return err
}
if _, err = notificationBot.Send(tb.ChatID(config.NotificationChannel), fmt.Sprintf("PING MSG from %s", config.ModuleLogger)); err != nil {
if _, err = notificationBot.Send(tb.ChatID(config.NotificationChannel), fmt.Sprintf("PING MSG from %s", models.ModuleLogger)); err != nil {
return err
}

5
internal/models/config.go
View File

@ -27,7 +27,6 @@ type Config struct {
KafkaTopic string `json:"topic" env:"KAFKA_TOPIC_TARIFF,required"`
KafkaBrokers []string `json:"brokers" env:"KAFKA_BROKERS,required"`
TrashLogHost string `env:"TRASH_LOG_HOST"`
ModuleLogger string `env:"MODULE_LOGGER"`
NotificationBotToken string `env:"NOTIFICATION_BOT_TOKEN"`
NotificationChannel int64 `env:"NOTIFICATION_CHANNEL"`
AdminURL string `env:"ADMIN_FRONT_URL"`
@ -60,3 +59,7 @@ type JWTConfiguration struct {
}
const mongoVersion uint32 = 1
// после дисскусии с Мишей пришли к выводу что смысла передавать этот парметр через переменные среды нет.
// потому что в зависимости от типа текущего сервиса, тестового/продового он будет с ним ходить в разные сервисы trashlog
const ModuleLogger = "customer"