Merge pull request #159 from arran4/fix/config-loading-issue

Allow running with environment variables only

Author: arran4

Dockerfile

@@ -21,7 +21,6 @@ ENV GITHUB_SERVER=""
 ENV GITLAB_SERVER=""
 ENV LOCAL_GIT_PATH=/var/lib/gobookmarks/localgit
 ENV GOBM_ENV_FILE=/etc/gobookmarks/gobookmarks.env
-ENV GOBM_CONFIG_FILE=/etc/gobookmarks/config.json
 EXPOSE 8080
 EXPOSE 8443
 COPY gobookmarks /bin/gobookmarks

cmd/gobookmarks/main.go

@@ -145,16 +145,14 @@ func (c *RootCommand) loadConfig() error {
 	}
 
 	cfgSpecified := c.ConfigPath != "" || os.Getenv("GOBM_CONFIG_FILE") != ""
-	if fileCfg, found, err := LoadConfigFile(configPath); err == nil {
-		if found {
-			MergeConfig(&c.cfg, fileCfg)
-		}
-	} else {
-		if os.IsNotExist(err) && !cfgSpecified {
-			log.Printf("config file %s not found", configPath)
-		} else {
-			return fmt.Errorf("unable to load config file %s: %w", configPath, err)
-		}
+	fileCfg, found, err := LoadConfigFile(configPath)
+	if err != nil {
+		return fmt.Errorf("unable to load config file %s: %w", configPath, err)
+	}
+	if found {
+		MergeConfig(&c.cfg, fileCfg)
+	} else if cfgSpecified {
+		return fmt.Errorf("unable to load config file %s: not found", configPath)
 	}
 	return nil
 }

config.go

@@ -48,7 +48,7 @@ func LoadConfigFile(path string) (Config, bool, error) {
 	if err != nil {
 		if os.IsNotExist(err) {
 			log.Printf("config file %s not found", path)
-			return c, false, err
+			return c, false, nil
 		}
 		return c, false, fmt.Errorf("unable to read config file: %w", err)
 	}