diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 6f423a5..d2bed00 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -19,8 +19,12 @@ func main() { log.Fatalf("error loading config: %v", err) } - if cfg.HTTPUrl == "" { - log.Fatalf("error http url is empty") + if cfg.ClientHttpUrl == "" { + 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) @@ -66,7 +70,8 @@ func loadConfig() (initialize.Config, error) { RedisPassword: os.Getenv("REDIS_PASSWORD"), RedisDB: int(envToInt64(os.Getenv("REDIS_DB"))), 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 diff --git a/cmd/validator/main_test.go b/cmd/validator/main_test.go index f511596..9cc26e6 100644 --- a/cmd/validator/main_test.go +++ b/cmd/validator/main_test.go @@ -20,7 +20,8 @@ func TestLoadConfig(t *testing.T) { "REDIS_HOST": "localhost:6379", "REDIS_PASSWORD": "admin", "REDIS_DB": "2", - "HTTP_URL": "localhost:3000", + "CLIENT_HTTP_URL": "localhost:3000", + "ADMIN_HTTP_URL": "localhost:3001", "TELEGRAM_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg", "TELEGRAM_CHANNEL_ID": "1001344671794", } diff --git a/internal/app/app.go b/internal/app/app.go index 2e8735f..9b2c5bf 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -121,7 +121,7 @@ func Run(ctx context.Context, cfg initialize.Config, build Build) error { }) 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)) cancel() } diff --git a/internal/initialize/config.go b/internal/initialize/config.go index 72f5e60..79151ca 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -16,7 +16,8 @@ type Config struct { RedisHost string `env:"REDIS_HOST" envDefault:"localhost:6379"` RedisPassword string `env:"REDIS_PASSWORD" envDefault:"admin"` 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"` TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID" envDefault:"1001344671794"` ExternalCfg ExternalCfg