Skip to content

Explicit .env load #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2025
Merged

Explicit .env load #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
package main

import (
"flag"
"github.com/joho/godotenv"
"log/slog"
"os"
"strconv"
)

var fileChecked = false

func loadEnvFile() {
if !checkedEnvFile {
if err := godotenv.Load(".env.local", ".env"); err != nil {
slog.Debug(".env file not loaded;", "reason", err)
if !fileChecked {
if flag.NArg() > 0 {
path := flag.Arg(0)
if err := godotenv.Load(path); err != nil {
slog.Debug(".env file not loaded;", "path", path, "reason", err)
}
}

checkedEnvFile = true
fileChecked = true
}
}

Expand Down Expand Up @@ -74,6 +80,3 @@ func getEnv(key string, defaultValue interface{}) interface{} {

return defaultValue
}

// one time check for .env file
var checkedEnvFile = false
4 changes: 4 additions & 0 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"flag"
"fmt"
"github.com/jspaste/frontend/www"
"github.com/valyala/fasthttp"
Expand All @@ -14,6 +15,9 @@ import (
)

func main() {
slog.SetLogLoggerLevel(slog.LevelInfo)
flag.Parse()

bindAddressEnv := getEnv("JSPF_BIND_ADDRESS", "[::]").(string)
portEnv := getEnv("JSPF_PORT", uint16(3000)).(uint16)

Expand Down