xevion/banner
1
0
Fork 0
mirror of https://github.com/Xevion/banner.git synced 2025-12-11 10:06:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix private URL var name, add helper for retrieving various environment variables

Browse Source
This commit is contained in:
Xevion
2023-12-24 22:07:44 -06:00
parent 37604e1eeb
commit 7e762ff2aa
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
helpers.go
View File

@@ -5,6 +5,7 @@ import (
"io" "io"
"math/rand" "math/rand"
"net/http" "net/http"
"os"
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
@@ -177,3 +178,12 @@ func (nt NaiveTime) String() string {
} }
return fmt.Sprintf("%d:%02d%s", hour, nt.Minutes, meridiem) return fmt.Sprintf("%d:%02d%s", hour, nt.Minutes, meridiem)
} }
func GetFirstEnv(key ...string) string {
for _, k := range key {
if v := os.Getenv(k); v != "" {
return v
}
}
return ""
}

16
main.go
View File

@@ -59,12 +59,9 @@ func init() {
ctx = context.Background() ctx = context.Background()
// Try to grab the environment variable, or default to development // Try to grab the environment variable, or default to development
env := os.Getenv("ENVIRONMENT") env := GetFirstEnv("ENVIRONMENT", "RAILWAY_ENVIRONMENT")
if env == "" { if env == "" {
env = os.Getenv("RAILWAY_ENVIRONMENT") env = "development"
if env == "" {
env = "development"
}
} }
// Use the custom console writer if we're in development // Use the custom console writer if we're in development
@@ -85,13 +82,12 @@ func init() {
func main() { func main() {
// Setup redis // Setup redis
redisUrl := os.Getenv("REDIS_URL") redisUrl := GetFirstEnv("REDIS_URL", "REDIS_PRIVATE_URL")
if redisUrl == "" { if redisUrl == "" {
redisUrl = os.Getenv("PRIVATE_REDIS_URL") log.Fatal().Msg("REDIS_URL/REDIS_PRIVATE_URL not set")
if redisUrl == "" {
log.Fatal().Msg("REDIS_URL is not set (public or private)")
}
} }
// Parse URL and create client
options, err := redis.ParseURL(redisUrl) options, err := redis.ParseURL(redisUrl)
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("Cannot parse redis url") log.Fatal().Err(err).Msg("Cannot parse redis url")