summaryrefslogtreecommitdiff
path: root/internal/config
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-08-29 12:09:52 +0300
committerPaul Buetow <paul@buetow.org>2024-08-29 12:09:52 +0300
commit3f0dfd23836de58645a938ad3cb469777e8450e2 (patch)
treeaccad695b042b9c74c4f54acbe7aa699b5e898b0 /internal/config
parent2b02b828778c2e95a3c4e4fb7b41a8b626d1ba01 (diff)
skip config file if it doesn't exist
Diffstat (limited to 'internal/config')
-rw-r--r--internal/config/client/client.go5
-rw-r--r--internal/config/server/server.go5
2 files changed, 8 insertions, 2 deletions
diff --git a/internal/config/client/client.go b/internal/config/client/client.go
index 613ec60..acb3503 100644
--- a/internal/config/client/client.go
+++ b/internal/config/client/client.go
@@ -22,7 +22,10 @@ type ClientConfig struct {
func New(configFile string) (ClientConfig, error) {
conf, err := config.FromFile[ClientConfig](configFile)
if err != nil {
- log.Println("Proceeding with default config, as:", err)
+ if _, ok := err.(*os.PathError); !ok {
+ return conf, err
+ }
+ log.Println("Skipping config file:", err)
}
conf.Server = config.EnvToStr("GOS_SERVERS", conf.Server)
diff --git a/internal/config/server/server.go b/internal/config/server/server.go
index 6d65f5f..1032a9f 100644
--- a/internal/config/server/server.go
+++ b/internal/config/server/server.go
@@ -25,7 +25,10 @@ type ServerConfig struct {
func New(configFile, secretsFile string) (ServerConfig, error) {
conf, err := config.FromFile[ServerConfig](configFile)
if err != nil {
- log.Println("proceeding with default config, as:", err)
+ if _, ok := err.(*os.PathError); !ok {
+ return conf, err
+ }
+ log.Println("Skipping config file:", err)
}
if conf.Secrets, err = newSecretsConfig(secretsFile); err != nil {