SQuiz/answerer
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

optimize cfg

Browse Source
This commit is contained in:
Pasha 2025-02-24 21:38:49 +03:00
parent b52103bf63
commit 7c0eb873b0
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/app/app.go
View File

@ -72,7 +72,7 @@ func New(ctx context.Context, cfg initialize.Config, build Build) error {
return zapcore.NewTee(core, clickHouseLogger) return zapcore.NewTee(core, clickHouseLogger)
})) }))
loggerHlog := hlog.New(loggerForHlog).Module(cfg.ModuleLogger) loggerHlog := hlog.New(loggerForHlog).Module(initialize.ModuleLogger)
loggerHlog.With(models.AllFields{}) loggerHlog.With(models.AllFields{})
loggerHlog.Emit(InfoSvcStarted{}) loggerHlog.Emit(InfoSvcStarted{})
@ -133,7 +133,7 @@ func New(ctx context.Context, cfg initialize.Config, build Build) error {
}) })
go func() { go func() {
if err := srv.Start(cfg.HttpHost + ":" + cfg.NumberPort); err != nil { if err := srv.Start(cfg.ClientHttpURL); err != nil {
zapLogger.Error("HTTP server startup error", zap.Error(err)) zapLogger.Error("HTTP server startup error", zap.Error(err))
cancel() cancel()
} }

36
internal/initialize/config.go
View File

@ -7,24 +7,22 @@ import (
) )
type Config struct { type Config struct {
LoggerProdMode bool `env:"IS_PROD_LOG" envDefault:"false"` LoggerProdMode bool `env:"IS_PROD_LOG" envDefault:"false"`
IsProd bool `env:"IS_PROD" envDefault:"false"` IsProd bool `env:"IS_PROD" envDefault:"false"`
MinioEP string `env:"MINIO_EP" envDefault:"localhost:3002"` S3Endpoint string `env:"S3_ENDPOINT" envDefault:"localhost:3002"`
MinioAK string `env:"MINIO_AK" envDefault:"minio"` S3AccessKey string `env:"S3_ACCESS_KEY" envDefault:"minio"`
MinioSK string `env:"MINIO_SK" envDefault:"miniostorage"` S3SecretKey string `env:"S3_SECRET_KEY" envDefault:"miniostorage"`
NumberPort string `env:"PORT" envDefault:"1490"` ClientHttpURL string `env:"CLIENT_HTTP_URL" envDefault:"0.0.0.0:1490"`
HttpHost string `env:"HTTP_HOST" envDefault:"0.0.0.0"` CrtFile string `env:"CRT" envDefault:"server.crt"`
CrtFile string `env:"CRT" envDefault:"server.crt"` KeyFile string `env:"KEY" envDefault:"server.key"`
KeyFile string `env:"KEY" envDefault:"server.key"` PostgresURL string `env:"POSTGRES_URL" envDefault:"host=localhost port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"`
PostgresCredentials string `env:"PG_CRED" envDefault:"host=localhost port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"` RedisHost string `env:"REDIS_HOST"`
RedisHost string `env:"REDIS_HOST"` RedisPassword string `env:"REDIS_PASSWORD"`
RedisPassword string `env:"REDIS_PASSWORD"` RedisDB uint64 `env:"REDIS_DB"`
RedisDB uint64 `env:"REDIS_DB"` RedirectURL string `env:"REDIRECT_URL" envDefault:"https://squiz.pena.digital"`
RedirectURL string `env:"REDIRECT_URL" envDefault:"https://squiz.pena.digital"` PubKey string `env:"ENCRYPT_PUBLIC_KEY"`
PubKey string `env:"PUBLIC_KEY"` PrivKey string `env:"ENCRYPT_PRIVATE_KEY"`
PrivKey string `env:"PRIVATE_KEY"` TrashLogHost string `env:"TRASH_LOG_HOST" envDefault:"localhost:7113"`
TrashLogHost string `env:"TRASH_LOG_HOST" envDefault:"localhost:7113"`
ModuleLogger string `env:"MODULE_LOGGER" envDefault:"answerer-local"`
} }
func LoadConfig() (*Config, error) { func LoadConfig() (*Config, error) {
@ -37,3 +35,5 @@ func LoadConfig() (*Config, error) {
} }
return &config, nil return &config, nil
} }
const ModuleLogger = "answerer"

2
internal/initialize/dals.go
View File

@ -13,7 +13,7 @@ type DALs struct {
} }
func NewDALs(ctx context.Context, cfg Config, minioClient *minio.Client) (*DALs, error) { func NewDALs(ctx context.Context, cfg Config, minioClient *minio.Client) (*DALs, error) {
pgDAL, err := dal.New(ctx, cfg.PostgresCredentials, minioClient) pgDAL, err := dal.New(ctx, cfg.PostgresURL, minioClient)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/initialize/minio.go
View File

@ -6,8 +6,8 @@ import (
) )
func NewMinio(cfg Config) (*minio.Client, error) { func NewMinio(cfg Config) (*minio.Client, error) {
minioClient, err := minio.New(cfg.MinioEP, &minio.Options{ minioClient, err := minio.New(cfg.S3Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(cfg.MinioAK, cfg.MinioSK, ""), Creds: credentials.NewStaticV4(cfg.S3AccessKey, cfg.S3SecretKey, ""),
Secure: cfg.IsProd, Secure: cfg.IsProd,
}) })
if err != nil { if err != nil {