diff --git a/.env b/.env index 89d45e7..de18205 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PORT=8443 +VERSIA_PORT=8443 PUBLIC_ADDRESS=https://localhost INSTANCE_NAME=lysand-test diff --git a/compose.yml b/compose.yml index a4696d7..a6af974 100644 --- a/compose.yml +++ b/compose.yml @@ -37,7 +37,7 @@ services: source: ./1.db target: /app/test.db environment: - PORT: 8443 + VERSIA_PORT: 8443 NATS_URI: nats://nats:4222 PUBLIC_ADDRESS: https://lysand-test.i.devminer.xyz:8443 NATS_STREAM_NAME: versia-go-1 @@ -60,7 +60,7 @@ services: source: ./2.db target: /app/test.db environment: - PORT: 8444 + VERSIA_PORT: 8444 NATS_URI: nats://nats:4222 PUBLIC_ADDRESS: https://lysand-test-2.i.devminer.xyz:8444 NATS_STREAM_NAME: versia-go-2 diff --git a/config/config.go b/config/config.go index 8e24733..7c56cab 100644 --- a/config/config.go +++ b/config/config.go @@ -43,14 +43,13 @@ func Load() { var forwardTracesTo *regexp.Regexp if raw := optionalEnvStr("FORWARD_TRACES_TO"); raw != nil { - if forwardTracesTo, err = regexp.Compile(*raw); err != nil { - log.Panic().Err(err).Str("raw", *raw).Msg("Failed to compile") + log.Fatal().Err(err).Str("raw", *raw).Msg("Failed to compile") } } C = Config{ - Port: getEnvInt("PORT", 80), + Port: getEnvInt("VERSIA_PORT", 80), PublicAddress: publicAddress, Host: publicAddress.Host,