refactor: use a common logger for consistency

All kapow messages will end up in stderr (incl. debug mode).
stdout is reserved for the access logs.

Co-authored-by: Roberto Abdelkader Martínez Pérez <robertomartinezp@gmail.com>
This commit is contained in:
pancho horrillo
2020-12-16 17:29:26 +01:00
parent d62a9dba68
commit 41be4f9344
11 changed files with 60 additions and 53 deletions
+2 -2
View File
@@ -17,12 +17,12 @@
package cmd
import (
"log"
"os"
"github.com/spf13/cobra"
"github.com/BBVA/kapow/internal/client"
"github.com/BBVA/kapow/internal/logger"
)
// GetCmd is the command line interface for get kapow data operation
@@ -38,7 +38,7 @@ var GetCmd = &cobra.Command{
err := client.GetData(dataURL, handler, args[0], os.Stdout)
if err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
},
}
+5 -5
View File
@@ -18,10 +18,10 @@ package cmd
import (
"io/ioutil"
"log"
"os"
"github.com/BBVA/kapow/internal/client"
"github.com/BBVA/kapow/internal/logger"
"github.com/spf13/cobra"
)
@@ -39,7 +39,7 @@ func init() {
controlURL, _ := cmd.Flags().GetString("control-url")
if err := client.ListRoutes(controlURL, os.Stdout); err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
},
}
@@ -67,13 +67,13 @@ func init() {
buf, err = ioutil.ReadFile(commandFile)
}
if err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
command = string(buf)
}
if err := client.AddRoute(controlURL, urlPattern, method, entrypoint, command, os.Stdout); err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
},
}
@@ -91,7 +91,7 @@ func init() {
controlURL, _ := cmd.Flags().GetString("control-url")
if err := client.RemoveRoute(controlURL, args[0]); err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
},
}
+5 -7
View File
@@ -18,13 +18,12 @@ package cmd
import (
"errors"
"fmt"
"log"
"os"
"os/exec"
"github.com/spf13/cobra"
"github.com/BBVA/kapow/internal/logger"
"github.com/BBVA/kapow/internal/server"
)
@@ -62,9 +61,9 @@ var ServerCmd = &cobra.Command{
powfile := args[0]
_, err := os.Stat(powfile)
if os.IsNotExist(err) {
log.Fatalf("%s does not exist", powfile)
logger.L.Fatalf("%s does not exist", powfile)
}
log.Printf("Running powfile: %q\n", powfile)
logger.L.Printf("Running powfile: %q\n", powfile)
kapowCMD := exec.Command("bash", powfile)
kapowCMD.Stdout = os.Stdout
kapowCMD.Stderr = os.Stderr
@@ -72,10 +71,9 @@ var ServerCmd = &cobra.Command{
err = kapowCMD.Run()
if err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
fmt.Println()
log.Printf("Done running powfile: %q\n", powfile)
logger.L.Printf("Done running powfile: %q\n", powfile)
}
select {}
+2 -2
View File
@@ -18,11 +18,11 @@ package cmd
import (
"io"
"log"
"os"
"strings"
"github.com/BBVA/kapow/internal/client"
"github.com/BBVA/kapow/internal/logger"
"github.com/spf13/cobra"
)
@@ -47,7 +47,7 @@ var SetCmd = &cobra.Command{
}
if err := client.SetData(dataURL, handler, path, r); err != nil {
log.Fatal(err)
logger.L.Fatal(err)
}
},
}