From 5f039654f077e89b82d4a955fbc1b2ec40de4f7e Mon Sep 17 00:00:00 2001 From: Long Dinh Date: Mon, 18 May 2026 08:52:57 +0700 Subject: [PATCH] refactor: move home env vars after godotenv and use lookupEnv helper Address review feedback: move HOME_ADDR/HOME_PASSWORD lookup after godotenv.Load() so .env files work, and use the lookupEnv helper for case-insensitive key support consistent with PGSTORE_* etc. Co-Authored-By: Claude Opus 4.7 --- cmd/server/main.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 45e618057..99d8780aa 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -247,18 +247,6 @@ func main() { // Parse the command-line flags. flag.Parse() - // Allow env var fallback for home flags so they can be configured without command args. - if strings.TrimSpace(homeAddr) == "" { - if v, ok := os.LookupEnv("HOME_ADDR"); ok { - homeAddr = strings.TrimSpace(v) - } - } - if strings.TrimSpace(homePassword) == "" { - if v, ok := os.LookupEnv("HOME_PASSWORD"); ok { - homePassword = strings.TrimSpace(v) - } - } - // Core application variables. var err error var cfg *config.Config @@ -311,6 +299,19 @@ func main() { return "", false } writableBase := util.WritablePath() + + // Allow env var fallback for home flags so they can be configured without command args. + if strings.TrimSpace(homeAddr) == "" { + if v, ok := lookupEnv("HOME_ADDR", "home_addr"); ok { + homeAddr = v + } + } + if strings.TrimSpace(homePassword) == "" { + if v, ok := lookupEnv("HOME_PASSWORD", "home_password"); ok { + homePassword = v + } + } + if value, ok := lookupEnv("PGSTORE_DSN", "pgstore_dsn"); ok { usePostgresStore = true pgStoreDSN = value