diff options
| author | Paul Buetow <paul@buetow.org> | 2024-08-11 22:02:21 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-08-11 22:02:21 +0300 |
| commit | 94ceede429dc807b54ceab0f27d74b98c94dc5ac (patch) | |
| tree | 3990fdb349d7c5ad76b2602a4017350c5224c796 /internal/config/server/server.go | |
| parent | ff4ca68dfd54771aab5a1b07918aaea7237fbaaa (diff) | |
can configre cron interval
Diffstat (limited to 'internal/config/server/server.go')
| -rw-r--r-- | internal/config/server/server.go | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/internal/config/server/server.go b/internal/config/server/server.go index 69bfae2..d46a32a 100644 --- a/internal/config/server/server.go +++ b/internal/config/server/server.go @@ -4,7 +4,6 @@ import ( "fmt" "log" "os" - "strconv" "strings" "codeberg.org/snonux/gos/internal/config" @@ -24,14 +23,14 @@ type ServerConfig struct { func New(configFile string) (ServerConfig, error) { conf, _ := config.FromFile[ServerConfig](configFile) - conf.ListenAddr = config.FromENV("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") - conf.Partner = config.FromENV("GOS_PARTNER", conf.Partner) - conf.APIKey = config.FromENV("GOS_API_KEY", conf.APIKey) - conf.DataDir = config.FromENV("GOS_DATA_DIR", conf.DataDir, "data") - conf.EmailTo = config.FromENV("GOS_EMAIL_TO", conf.EmailTo) - conf.EmailFrom = config.FromENV("GOS_EMAIL_FROM", conf.EmailFrom) + conf.ListenAddr = config.StrFromENV("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") + conf.Partner = config.StrFromENV("GOS_PARTNER", conf.Partner) + conf.APIKey = config.StrFromENV("GOS_API_KEY", conf.APIKey) + conf.DataDir = config.StrFromENV("GOS_DATA_DIR", conf.DataDir, "data") + conf.EmailTo = config.StrFromENV("GOS_EMAIL_TO", conf.EmailTo) + conf.EmailFrom = config.StrFromENV("GOS_EMAIL_FROM", conf.EmailFrom) - conf.SMTPServer = config.FromENV("GOS_SMTP_SERVER", conf.SMTPServer) + conf.SMTPServer = config.StrFromENV("GOS_SMTP_SERVER", conf.SMTPServer) if conf.SMTPServer == "" { hostname, err := os.Hostname() if err != nil { @@ -41,14 +40,7 @@ func New(configFile string) (ServerConfig, error) { log.Println("Set SMTPServer to " + conf.SMTPServer) } - // TODO: When there are more int parsing cases in the config, use generic? config.FromENV? - if conf.CRONMergeIntervalS == 0 { - var err error - if conf.CRONMergeIntervalS, err = strconv.Atoi(config.FromENV("GOS_CRON_MERGE_INTERVAL", "3600")); err != nil { - return conf, err - } - } - + conf.CRONMergeIntervalS = config.IntFromENV("GOS_CRON_MERGE_INTERVAL", 3600) return conf, nil } |