PenaSide/verification
3
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

upd config with codeconv

Browse Source
This commit is contained in:
Pasha 2024-12-09 15:18:56 +03:00
parent 10219e1098
commit 5d9c6ffc7e
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/app/app_verification.go
View File

@ -49,12 +49,12 @@ func Run(cfg *config.Config, build Build) {
return zapcore.NewTee(core, clickHouseLogger) return zapcore.NewTee(core, clickHouseLogger)
}), zap.AddCallerSkip(2)) }), zap.AddCallerSkip(2))
loggerHlog := hlog.New(loggerForHlog).Module(cfg.ModuleLogger) loggerHlog := hlog.New(loggerForHlog).Module(config.ModuleLogger)
loggerHlog.With(models.AllFields{}) loggerHlog.With(models.AllFields{})
loggerHlog.Emit(app.InfoSvcStarted{}) loggerHlog.Emit(app.InfoSvcStarted{})
mongoDB, err := mongo.Connect(ctx, &mongo.ConnectDeps{ mongoDB, err := mongo.Connect(ctx, &mongo.ConnectDeps{
Configuration: &cfg.Database, Configuration: &cfg.External.Database,
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
}) })
@ -63,7 +63,7 @@ func Run(cfg *config.Config, build Build) {
} }
minioClient, err := minio.New(cfg.S3Endpoint, &minio.Options{ minioClient, err := minio.New(cfg.S3Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(cfg.S3AccessKeyID, cfg.S3SecretKey, ""), Creds: credentials.NewStaticV4(cfg.S3AccessKey, cfg.S3SecretKey, ""),
Secure: true, Secure: true,
}) })
if err != nil { if err != nil {
@ -84,11 +84,11 @@ func Run(cfg *config.Config, build Build) {
Logger: logger, Logger: logger,
Bot: tgBot, Bot: tgBot,
ChatID: cfg.TelegramChannelID, ChatID: cfg.TelegramChannelID,
StagingURL: cfg.StagingURL, StagingURL: cfg.VerificationMicroserviceURL,
}) })
cons := initialize.NewControllers(reps, telegram, customer_clients.NewCustomersClient(customer_clients.CustomersClientDeps{ cons := initialize.NewControllers(reps, telegram, customer_clients.NewCustomersClient(customer_clients.CustomersClientDeps{
Logger: logger, Logger: logger,
CustomerServiceHost: cfg.CustomerRPCHost, CustomerServiceHost: cfg.CustomerMicroserviceRPCURL,
})) }))
userSrv := server.NewHTTP(server.ServerConfig{ userSrv := server.NewHTTP(server.ServerConfig{
@ -104,13 +104,13 @@ func Run(cfg *config.Config, build Build) {
}) })
go func() { go func() {
if err := userSrv.Start(cfg.HttpAddressUser); err != nil { if err := userSrv.Start(cfg.ClientHttpURL); err != nil {
logger.Fatal("Server startup error", zap.Error(err)) logger.Fatal("Server startup error", zap.Error(err))
} }
}() }()
go func() { go func() {
if err := adminSrv.Start(cfg.HttpAddressAdmin); err != nil { if err := adminSrv.Start(cfg.AdminHttpURL); err != nil {
logger.Fatal("Server startup error", zap.Error(err)) logger.Fatal("Server startup error", zap.Error(err))
} }
}() }()

34
internal/config/config.go
View File

@ -7,21 +7,23 @@ import (
) )
type Config struct { type Config struct {
TelegramToken string `env:"TELEGRAM_TOKEN,required"` TelegramToken string `env:"TELEGRAM_TOKEN,required"`
TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID,required"` TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID,required"`
HttpAddressUser string `env:"HTTP_ADDRESS_USER,required"` ClientHttpURL string `env:"CLIENT_HTTP_URL,required"`
HttpAddressAdmin string `env:"HTTP_ADDRESS_ADMIN,required"` AdminHttpURL string `env:"ADMIN_HTTP_URL,required"`
S3Endpoint string `env:"S3_ENDPOINT,required"` S3Endpoint string `env:"S3_ENDPOINT,required"`
S3AccessKeyID string `env:"S3_ACCESS_KEY_ID,required"` S3AccessKey string `env:"S3_ACCESS_KEY,required"`
S3SecretKey string `env:"S3_SECRET_KEY,required"` S3SecretKey string `env:"S3_SECRET_KEY,required"`
CustomerSvcAddress string `env:"CUSTOMER_SVC_ADDRESS,required"` S3Folder string `env:"S3_FOLDER,required"`
StagingURL string `env:"STAGING_URL,required"` S3FileUrl string `env:"S3_FILE_URL,required"`
S3Folder string `env:"S3_FOLDER,required"` CustomerMicroserviceRPCURL string `env:"CUSTOMER_MICROSERVICE_RPC_URL,required"`
S3FileUrl string `env:"S3_FILE_URL,required"` TrashLogHost string `env:"TRASH_LOG_HOST,required"`
CustomerRPCHost string `env:"CUSTOMER_RPC_HOST,required"` VerificationMicroserviceURL string `env:"VERIFICATION_MICROSERVICE_URL,required"`
TrashLogHost string `env:"TRASH_LOG_HOST,required"` External External
ModuleLogger string `env:"MODULE_LOGGER,required"` }
Database mongo.Configuration
type External struct {
Database mongo.Configuration
} }
func NewConfig(file ...string) (*Config, error) { func NewConfig(file ...string) (*Config, error) {
@ -36,3 +38,5 @@ func NewConfig(file ...string) (*Config, error) {
return &cfg, nil return &cfg, nil
} }
const ModuleLogger = "verification"