diff options
| author | Paul Buetow <paul@buetow.org> | 2024-09-03 22:54:04 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-09-03 22:54:04 +0300 |
| commit | 74de487c57f22c4c7f9b04404a21b3a69f252f70 (patch) | |
| tree | 19733a34d77c928ea51c85f1aebd78bb245d1143 /internal/config/server | |
| parent | 1fcd3eca65b9339fac1348cd2a4ab81110882f11 (diff) | |
hiding generics as types cant be inferred
Diffstat (limited to 'internal/config/server')
| -rw-r--r-- | internal/config/server/server.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/internal/config/server/server.go b/internal/config/server/server.go index 1a5d40f..8454c34 100644 --- a/internal/config/server/server.go +++ b/internal/config/server/server.go @@ -35,14 +35,14 @@ func New(configFile, secretsFile string) (ServerConfig, error) { return conf, err } - conf.ListenAddr = config.Env[config.Str]("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") - conf.Partners = config.Env[config.StrSlice]("GOS_PARTNERS", conf.Partners) - conf.APIKey = config.Env[config.Str]("GOS_API_KEY", conf.APIKey) - conf.DataDir = config.Env[config.Str]("GOS_DATA_DIR", conf.DataDir, "data") - conf.EmailTo = config.Env[config.Str]("GOS_EMAIL_TO", conf.EmailTo) - conf.EmailFrom = config.Env[config.Str]("GOS_EMAIL_FROM", conf.EmailFrom) - - conf.SMTPServer = config.Env[config.Str]("GOS_SMTP_SERVER", conf.SMTPServer, func() string { + conf.ListenAddr = config.Str("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") + conf.Partners = config.StrSlice("GOS_PARTNERS", conf.Partners) + conf.APIKey = config.Str("GOS_API_KEY", conf.APIKey) + conf.DataDir = config.Str("GOS_DATA_DIR", conf.DataDir, "data") + conf.EmailTo = config.Str("GOS_EMAIL_TO", conf.EmailTo) + conf.EmailFrom = config.Str("GOS_EMAIL_FROM", conf.EmailFrom) + + conf.SMTPServer = config.Str("GOS_SMTP_SERVER", conf.SMTPServer, func() string { hostname, err := os.Hostname() if err != nil { log.Fatal(err) @@ -51,8 +51,8 @@ func New(configFile, secretsFile string) (ServerConfig, error) { }) const oneHour = 3600 - conf.MergeIntervalS = config.Env[config.Int]("GOS_MERGE_INTERVAL", oneHour) - conf.ScheduleIntervalS = config.Env[config.Int]("GOS_SCHEDULER_INTERVAL", oneHour*6) + conf.MergeIntervalS = config.Int("GOS_MERGE_INTERVAL", oneHour) + conf.ScheduleIntervalS = config.Int("GOS_SCHEDULER_INTERVAL", oneHour*6) return conf, nil } |