From b14ea93a64bde7b822a3bcd0c3af8501f7a7e52c Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Thu, 17 Oct 2019 17:11:19 +0200 Subject: [PATCH] Minor fixes on error handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: César Gallego --- internal/cmd/get.go | 5 ++--- internal/cmd/route.go | 11 ++++------- internal/cmd/server.go | 2 +- internal/cmd/set.go | 5 ++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/internal/cmd/get.go b/internal/cmd/get.go index 0c2f96e..d62a399 100644 --- a/internal/cmd/get.go +++ b/internal/cmd/get.go @@ -1,7 +1,7 @@ package cmd import ( - "fmt" + "log" "os" "github.com/spf13/cobra" @@ -22,8 +22,7 @@ var GetCmd = &cobra.Command{ err := client.GetData(dataURL, handler, args[0], os.Stdout) if err != nil { - os.Stderr.WriteString(fmt.Sprintf("%v\n", err)) - os.Exit(1) + log.Fatal(err) } }, } diff --git a/internal/cmd/route.go b/internal/cmd/route.go index 4e2b21d..679efd4 100644 --- a/internal/cmd/route.go +++ b/internal/cmd/route.go @@ -1,7 +1,7 @@ package cmd import ( - "fmt" + "log" "os" "github.com/BBVA/kapow/internal/client" @@ -22,8 +22,7 @@ func init() { controlURL, _ := cmd.Flags().GetString("control-url") if err := client.ListRoutes(controlURL, os.Stdout); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + log.Fatal(err) } }, } @@ -43,8 +42,7 @@ func init() { // TODO: Read command from parameter, file or stdin if err := client.AddRoute(controlURL, urlPattern, method, entrypoint, command, os.Stdout); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + log.Fatal(err) } }, } @@ -62,8 +60,7 @@ func init() { controlURL, _ := cmd.Flags().GetString("control-url") if err := client.RemoveRoute(controlURL, args[0]); err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) + log.Fatal(err) } }, } diff --git a/internal/cmd/server.go b/internal/cmd/server.go index bc3605b..9a8720d 100644 --- a/internal/cmd/server.go +++ b/internal/cmd/server.go @@ -58,7 +58,7 @@ var ServerCmd = &cobra.Command{ // run bash -c "[pow files contents]" err = kapowCMD.Run() if err != nil { - fmt.Println(err) + log.Fatal(err) } select {} diff --git a/internal/cmd/set.go b/internal/cmd/set.go index 423169c..48176c0 100644 --- a/internal/cmd/set.go +++ b/internal/cmd/set.go @@ -1,8 +1,8 @@ package cmd import ( - "fmt" "io" + "log" "os" "strings" @@ -32,8 +32,7 @@ var SetCmd = &cobra.Command{ } if err := client.SetData(dataURL, handler, args[0], r); err != nil { - os.Stderr.WriteString(fmt.Sprintf("%v\n", err)) - os.Exit(1) + log.Fatal(err) } }, }