PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

added client and admin http urls for env

Browse Source
This commit is contained in:
Pasha 2024-12-06 11:04:28 +03:00 committed by skeris
parent 4f5e84fd98
commit de8adba8d5
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/validator/main.go
View File

@ -19,8 +19,12 @@ func main() {
log.Fatalf("error loading config: %v", err) log.Fatalf("error loading config: %v", err)
} }
if cfg.HTTPUrl == "" { if cfg.ClientHttpUrl == "" {
log.Fatalf("error http url is empty") log.Fatalf("error client http url is empty")
}
if cfg.AdminHttpUrl == "" {
log.Fatalf("error admin http url is empty")
} }
err = validate.ValidateMongo(cfg.ExternalCfg.Database) err = validate.ValidateMongo(cfg.ExternalCfg.Database)
@ -66,7 +70,8 @@ func loadConfig() (initialize.Config, error) {
RedisPassword: os.Getenv("REDIS_PASSWORD"), RedisPassword: os.Getenv("REDIS_PASSWORD"),
RedisDB: int(envToInt64(os.Getenv("REDIS_DB"))), RedisDB: int(envToInt64(os.Getenv("REDIS_DB"))),
TelegramChannelID: envToInt64(os.Getenv("TELEGRAM_CHANNEL_ID")), TelegramChannelID: envToInt64(os.Getenv("TELEGRAM_CHANNEL_ID")),
HTTPUrl: os.Getenv("HTTP_URL"), ClientHttpUrl: os.Getenv("CLIENT_HTTP_URL"),
AdminHttpUrl: os.Getenv("ADMIN_HTTP_URL"),
} }
return config, nil return config, nil

3
cmd/validator/main_test.go
View File

@ -20,7 +20,8 @@ func TestLoadConfig(t *testing.T) {
"REDIS_HOST": "localhost:6379", "REDIS_HOST": "localhost:6379",
"REDIS_PASSWORD": "admin", "REDIS_PASSWORD": "admin",
"REDIS_DB": "2", "REDIS_DB": "2",
"HTTP_URL": "localhost:3000", "CLIENT_HTTP_URL": "localhost:3000",
"ADMIN_HTTP_URL": "localhost:3001",
"TELEGRAM_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg", "TELEGRAM_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg",
"TELEGRAM_CHANNEL_ID": "1001344671794", "TELEGRAM_CHANNEL_ID": "1001344671794",
} }

2
internal/app/app.go
View File

@ -121,7 +121,7 @@ func Run(ctx context.Context, cfg initialize.Config, build Build) error {
}) })
go func() { go func() {
if err := srv.Start(cfg.HTTPUrl); err != nil { if err := srv.Start(cfg.ClientHttpUrl); err != nil {
logger.Error("Server startup error", zap.Error(err)) logger.Error("Server startup error", zap.Error(err))
cancel() cancel()
} }

3
internal/initialize/config.go
View File

@ -16,7 +16,8 @@ type Config struct {
RedisHost string `env:"REDIS_HOST" envDefault:"localhost:6379"` RedisHost string `env:"REDIS_HOST" envDefault:"localhost:6379"`
RedisPassword string `env:"REDIS_PASSWORD" envDefault:"admin"` RedisPassword string `env:"REDIS_PASSWORD" envDefault:"admin"`
RedisDB int `env:"REDIS_DB" envDefault:"2"` RedisDB int `env:"REDIS_DB" envDefault:"2"`
HTTPUrl string `env:"HTTP_URL" envDefault:"localhost:3000"` ClientHttpUrl string `env:"CLIENT_HTTP_URL" envDefault:"localhost:3000"`
AdminHttpUrl string `env:"ADMIN_HTTP_URL" envDefault:"localhost:3001"`
TelegramToken string `env:"TELEGRAM_TOKEN" envDefault:"7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg"` TelegramToken string `env:"TELEGRAM_TOKEN" envDefault:"7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg"`
TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID" envDefault:"1001344671794"` TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID" envDefault:"1001344671794"`
ExternalCfg ExternalCfg ExternalCfg ExternalCfg