Bug Fix #130: Forwarded all fatal messages to stderr

F1bonacc1 · Jan 28, 2024 · 554dbf5 · 554dbf5
1 parent cc5a927
commit 554dbf5
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 35 deletions.
diff --git a/src/cmd/down.go b/src/cmd/down.go
@@ -15,7 +15,7 @@ var downCmd = &cobra.Command{
 		pcClient := client.NewClient(*pcFlags.Address, *pcFlags.PortNum, *pcFlags.LogLength)
 		err := pcClient.ShutDownProject()
 		if err != nil {
-			logFatal(err, "failed to stop project")
+			log.Fatal().Err(err).Msg("failed to stop project")
 		}
 		log.Info().Msgf("Project stopped")
 	},

diff --git a/src/cmd/list.go b/src/cmd/list.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/f1bonacc1/process-compose/src/client"
+	"github.com/rs/zerolog/log"
 
 	"github.com/spf13/cobra"
 )
@@ -15,7 +16,7 @@ var listCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		processNames, err := client.GetProcessesName(*pcFlags.Address, *pcFlags.PortNum)
 		if err != nil {
-			logFatal(err, "failed to list processes")
+			log.Fatal().Err(err).Msg("failed to list processes")
 		}
 		for _, proc := range processNames {
 			fmt.Println(proc)

diff --git a/src/cmd/logs.go b/src/cmd/logs.go
@@ -22,8 +22,7 @@ var logsCmd = &cobra.Command{
 		}
 		err := logger.ReadProcessLogs(*pcFlags.Address, *pcFlags.PortNum, name, *pcFlags.LogTailLength, *pcFlags.LogFollow, os.Stdout)
 		if err != nil {
-			log.Error().Msgf("Failed to fetch logs for process %s: %v", name, err)
-			return
+			log.Fatal().Err(err).Msgf("Failed to fetch logs for process %s", name)
 		}
 		interrupt := make(chan os.Signal, 1)
 		signal.Notify(interrupt, os.Interrupt)

diff --git a/src/cmd/ports.go b/src/cmd/ports.go
@@ -17,7 +17,7 @@ var portsCmd = &cobra.Command{
 		name := args[0]
 		ports, err := client.GetProcessPorts(*pcFlags.Address, *pcFlags.PortNum, name)
 		if err != nil {
-			logFatal(err, "failed to get process %s ports", name)
+			log.Fatal().Err(err).Msgf("failed to get process %s ports", name)
 			return
 		}
 		log.Info().Msgf("Process %s TCP ports: %v", name, ports.TcpPorts)

diff --git a/src/cmd/project_runner.go b/src/cmd/project_runner.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"fmt"
 	"github.com/f1bonacc1/process-compose/src/admitter"
 	"github.com/f1bonacc1/process-compose/src/app"
 	"github.com/f1bonacc1/process-compose/src/loader"
@@ -19,8 +18,7 @@ func getProjectRunner(process []string, noDeps bool, mainProcess string, mainPro
 	}
 	project, err := loader.Load(opts)
 	if err != nil {
-		fmt.Println(err)
-		log.Fatal().Msg(err.Error())
+		log.Fatal().Err(err).Msg("Failed to load project")
 	}
 
 	prjOpts := app.ProjectOpts{}
@@ -34,8 +32,7 @@ func getProjectRunner(process []string, noDeps bool, mainProcess string, mainPro
 			WithNoDeps(noDeps),
 	)
 	if err != nil {
-		fmt.Println(err)
-		log.Fatal().Msg(err.Error())
+		log.Fatal().Err(err).Msg("Failed to initialize the project")
 	}
 	return runner
 }

diff --git a/src/cmd/restart.go b/src/cmd/restart.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/f1bonacc1/process-compose/src/client"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -15,7 +16,7 @@ var restartCmd = &cobra.Command{
 		name := args[0]
 		err := client.RestartProcess(*pcFlags.Address, *pcFlags.PortNum, name)
 		if err != nil {
-			logFatal(err, "failed to restart process %s", name)
+			log.Fatal().Err(err).Msgf("failed to restart process %s", name)
 		}
 		fmt.Printf("Process %s restarted\n", name)
 	},

diff --git a/src/cmd/root.go b/src/cmd/root.go
@@ -10,6 +10,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
+	"io"
 	"os"
 	"path"
 	"time"
@@ -88,10 +89,27 @@ func setupLogger() *os.File {
 	if err != nil {
 		logFatal(err, "Failed to open log file: %s", *pcFlags.LogFile)
 	}
-	log.Logger = log.Output(zerolog.ConsoleWriter{
-		Out:        file,
-		TimeFormat: "06-01-02 15:04:05.000",
-	})
+	writers := []io.Writer{
+		&zerolog.FilteredLevelWriter{
+
+			Level: zerolog.DebugLevel,
+			Writer: zerolog.LevelWriterAdapter{Writer: zerolog.ConsoleWriter{
+				Out:        file,
+				TimeFormat: "06-01-02 15:04:05.000",
+			}},
+		},
+		&zerolog.FilteredLevelWriter{
+
+			Level: zerolog.FatalLevel,
+			Writer: zerolog.LevelWriterAdapter{Writer: zerolog.ConsoleWriter{
+				Out:        os.Stderr,
+				TimeFormat: "06-01-02 15:04:05.000",
+			}},
+		},
+	}
+	writer := zerolog.MultiLevelWriter(writers...)
+
+	log.Logger = zerolog.New(writer).With().Timestamp().Logger()
 	zerolog.TimeFieldFormat = time.RFC3339Nano
 	zerolog.SetGlobalLevel(zerolog.DebugLevel)
 	return file

diff --git a/src/cmd/scale.go b/src/cmd/scale.go
@@ -17,11 +17,11 @@ var scaleCmd = &cobra.Command{
 		name := args[0]
 		count, err := strconv.Atoi(args[1])
 		if err != nil {
-			logFatal(err, "second argument must be an integer")
+			log.Fatal().Err(err).Msg("second argument must be an integer")
 		}
 		err = client.ScaleProcess(*pcFlags.Address, *pcFlags.PortNum, name, count)
 		if err != nil {
-			logFatal(err, "failed to scale process %s", name)
+			log.Fatal().Err(err).Msgf("failed to scale process %s", name)
 		}
 		log.Info().Msgf("Process %s scaled to %s", name, args[1])
 	},

diff --git a/src/cmd/start.go b/src/cmd/start.go
@@ -1,11 +1,9 @@
-/*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (
 	"fmt"
 	"github.com/f1bonacc1/process-compose/src/client"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +16,8 @@ var startCmd = &cobra.Command{
 		name := args[0]
 		err := client.StartProcess(*pcFlags.Address, *pcFlags.PortNum, name)
 		if err != nil {
-			logFatal(err, "failed to start process %s", name)
+			log.Fatal().Err(err).Msgf("failed to start process %s", name)
+
 		}
 		fmt.Printf("Process %s started\n", name)
 	},

diff --git a/src/cmd/state.go b/src/cmd/state.go
@@ -1,13 +1,11 @@
-/*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (
 	"fmt"
 	"github.com/f1bonacc1/process-compose/src/client"
 	"github.com/f1bonacc1/process-compose/src/types"
 	"github.com/fatih/color"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"strconv"
 	"strings"
@@ -26,7 +24,7 @@ var stateCmd = &cobra.Command{
 		pcClient := client.NewClient(*pcFlags.Address, *pcFlags.PortNum, *pcFlags.LogLength)
 		state, err := pcClient.GetProjectState(withMemoryUsage)
 		if err != nil {
-			logFatal(err, "failed to get project state")
+			log.Fatal().Err(err).Msg("failed to get project state")
 		}
 		//pretty print state
 		printState(state)

diff --git a/src/cmd/stop.go b/src/cmd/stop.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/f1bonacc1/process-compose/src/client"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -13,7 +14,7 @@ var stopCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		stopped, err := client.StopProcesses(*pcFlags.Address, *pcFlags.PortNum, args)
 		if err != nil {
-			logFatal(err, "failed to stop processes %v", args)
+			log.Fatal().Err(err).Msgf("failed to stop processes %v", args)
 		}
 		fmt.Printf("Processes %v stopped\n", stopped)
 	},

diff --git a/src/command/command.go b/src/command/command.go
@@ -8,7 +8,6 @@ import (
 	"runtime"
 )
 
-
 func BuildCommand(cmd string, args []string) *CmdWrapper {
 	return &CmdWrapper{
 		cmd: exec.Command(cmd, args...),
@@ -58,6 +57,6 @@ func DefaultShellConfig() *ShellConfig {
 func ValidateShellConfig(shell ShellConfig) {
 	_, err := exec.LookPath(shell.ShellCommand)
 	if err != nil {
-		log.Fatal().Msgf("Couldn't find %s", shell.ShellCommand)
+		log.Fatal().Err(err).Msgf("Couldn't find %s", shell.ShellCommand)
 	}
 }
diff --git a/src/config/config.go b/src/config/config.go
@@ -68,7 +68,7 @@ func getPortDefault() int {
 	if found {
 		port, err := strconv.Atoi(val)
 		if err != nil {
-			log.Fatal().Msgf("Invalid port number: %s", val)
+			log.Fatal().Err(err).Msgf("Invalid port number: %s", val)
 			return DefaultPortNum
 		}
 		return port

diff --git a/src/loader/loader.go b/src/loader/loader.go
@@ -79,8 +79,7 @@ func loadProjectFromFile(inputFile string) *types.Project {
 		if errors.Is(err, os.ErrNotExist) {
 			log.Error().Msgf("File %s doesn't exist", inputFile)
 		}
-		fmt.Printf("Failed to read %s - %s\n", inputFile, err.Error())
-		log.Fatal().Msg(err.Error())
+		log.Fatal().Err(err).Msgf("Failed to read %s", inputFile)
 	}
 
 	// .env is optional we don't care if it errors
@@ -93,13 +92,11 @@ func loadProjectFromFile(inputFile string) *types.Project {
 	}
 	err = yaml.Unmarshal(yamlFile, project)
 	if err != nil {
-		fmt.Printf("Failed to parse %s - %s\n", inputFile, err.Error())
-		log.Fatal().Msgf("Failed to parse %s - %s", inputFile, err.Error())
+		log.Fatal().Err(err).Msgf("Failed to parse %s", inputFile)
 	}
 
 	if err != nil {
-		fmt.Printf("Failed to validate %s - %s\n", inputFile, err.Error())
-		log.Fatal().Msgf("Failed to validate %s - %s", inputFile, err.Error())
+		log.Fatal().Err(err).Msgf("Failed to validate %s", inputFile)
 	}
 	log.Info().Msgf("Loaded project from %s", inputFile)
 	return project