lint warnings

1 files changed, 13 insertions, 8 deletions

diff --git a/internal/config/initializer.go b/internal/config/initializer.go
index 9724902..9c3bf64 100644
--- a/internal/config/initializer.go
+++ b/internal/config/initializer.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -34,8 +34,11 @@ func (in *initializer) parseConfig(args *Args) error {
 		paths = append(paths, fmt.Sprintf("%s/.config/dtail/dtail.conf", homeDir))
 		paths = append(paths, fmt.Sprintf("%s/.dtail.conf", homeDir))
 		for _, configPath := range paths {
-			if _, err := os.Stat(configPath); !os.IsNotExist(err) {
-				in.parseSpecificConfig(configPath)
+			if _, err := os.Stat(configPath); os.IsNotExist(err) {
+				continue
+			}
+			if err := in.parseSpecificConfig(configPath); err != nil {
+				return err
 			}
 		}
 	}
@@ -46,17 +49,17 @@ func (in *initializer) parseConfig(args *Args) error {
 func (in *initializer) parseSpecificConfig(configFile string) error {
 	fd, err := os.Open(configFile)
 	if err != nil {
-		return fmt.Errorf("Unable to read config file: %v", err)
+		return fmt.Errorf("Unable to read config file: %w", err)
 	}
 	defer fd.Close()
 
-	cfgBytes, err := ioutil.ReadAll(fd)
+	cfgBytes, err := io.ReadAll(fd)
 	if err != nil {
-		return fmt.Errorf("Unable to read config file %s: %v", configFile, err)
+		return fmt.Errorf("Unable to read config file %s: %w", configFile, err)
 	}
 
 	if err := json.Unmarshal([]byte(cfgBytes), in); err != nil {
-		return fmt.Errorf("Unable to parse config file %s: %v", configFile, err)
+		return fmt.Errorf("Unable to parse config file %s: %w", configFile, err)
 	}
 
 	return nil
@@ -116,7 +119,9 @@ func (in *initializer) setupConfig(sourceCb transformCb, args *Args,
 	}
 
 	setupLogDirectory(in)
-	sourceCb(in, args, additionalArgs)
+	if err := sourceCb(in, args, additionalArgs); err != nil {
+		return err
+	}
 	if args.Plain {
 		setupPlainMode(in, args)
 	}