Merge pull request #182 from covexo/improve-log

Implement Writer interface in log

Author: FabianKramm

pkg/devspace/clients/kubectl/client.go

@@ -222,7 +222,7 @@ func ForwardPorts(kubectlClient *kubernetes.Clientset, pod *k8sv1.Pod, ports []s
 
 	logFile := log.GetFileLogger("portforwarding")
 	dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", execRequest.URL())
-	fw, err := portforward.New(dialer, ports, stopChan, readyChan, logFile.GetStream(), logFile.GetStream())
+	fw, err := portforward.New(dialer, ports, stopChan, readyChan, logFile, logFile)
 
 	if err != nil {
 		return err

pkg/devspace/docker/docker.go

@@ -38,9 +38,8 @@ func BuildImage(dockerfilePath, buildtag string, buildArgs []string) error {
 
 	cmd := exec.CommandContext(ctx, "docker", dockerArgs...)
 
-	// TODO: Change output
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stdout
+	cmd.Stdout = log.GetInstance()
+	cmd.Stderr = log.GetInstance()
 
 	err = cmd.Run()
 
@@ -68,9 +67,8 @@ func PushImage(buildtag string) error {
 
 	cmd := exec.CommandContext(ctx, "docker", dockerArgs...)
 
-	// TODO: Change output
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stdout
+	cmd.Stdout = log.GetInstance()
+	cmd.Stderr = log.GetInstance()
 
 	err := cmd.Run()
 
@@ -93,9 +91,8 @@ func pushImageMinikube(buildtag string) error {
 
 	cmd := exec.CommandContext(ctx, "docker", dockerArgs...)
 
-	// TODO: Change output
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stdout
+	cmd.Stdout = log.GetInstance()
+	cmd.Stderr = log.GetInstance()
 
 	err = cmd.Run()
 
@@ -114,7 +111,6 @@ func builImageMinikube(dockerfilePath, buildtag string, buildArgs []string) erro
 	}
 
 	dockerArgs, err := getMinikubeCliArgs()
-
 	if err != nil {
 		return err
 	}
@@ -126,9 +122,8 @@ func builImageMinikube(dockerfilePath, buildtag string, buildArgs []string) erro
 
 	cmd := exec.CommandContext(ctx, "docker", dockerArgs...)
 
-	// TODO: Change output
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stdout
+	cmd.Stdout = log.GetInstance()
+	cmd.Stderr = log.GetInstance()
 
 	err = cmd.Run()
 

pkg/util/log/file_logger.go

@@ -1,7 +1,6 @@
 package log
 
 import (
-	"io"
 	"os"
 
 	"github.com/sirupsen/logrus"
@@ -180,10 +179,6 @@ func (f *fileLogger) SetLevel(level logrus.Level) {
 	f.logger.SetLevel(level)
 }
 
-func (f *fileLogger) GetStream() io.Writer {
-	return f.logger.Out
-}
-
 func (f *fileLogger) printWithContext(fnType logFunctionType, contextFields map[string]interface{}, args ...interface{}) {
 	switch fnType {
 	case doneFn:
@@ -222,6 +217,6 @@ func (f *fileLogger) printWithContextf(fnType logFunctionType, contextFields map
 	}
 }
 
-func (f *fileLogger) Write(message string) {
-	f.logger.Info(message)
+func (f *fileLogger) Write(message []byte) (int, error) {
+	return f.logger.Out.Write(message)
 }

pkg/util/log/log.go

@@ -142,13 +142,13 @@ func GetInstance() Logger {
 // WriteColored writes a message in color
 func WriteColored(message string, color ct.Color) {
 	ct.Foreground(color, false)
-	stdoutLog.Write(message)
+	stdoutLog.Write([]byte(message))
 	ct.ResetColor()
 }
 
 // Write writes to the stdout log without formatting the message, but takes care of locking the log and halting a possible wait message
 func Write(message string) {
-	stdoutLog.Write(message)
+	stdoutLog.Write([]byte(message))
 }
 
 // PrintTable prints a table with header columns and string values

pkg/util/log/logger.go

@@ -1,8 +1,6 @@
 package log
 
 import (
-	"io"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -38,10 +36,8 @@ type Logger interface {
 	Print(level logrus.Level, args ...interface{})
 	Printf(level logrus.Level, format string, args ...interface{})
 
-	Write(message string)
-
+	Write(message []byte) (int, error)
 	SetLevel(level logrus.Level)
-	GetStream() io.Writer
 
 	printWithContext(fnType logFunctionType, context map[string]interface{}, args ...interface{})
 	printWithContextf(fnType logFunctionType, context map[string]interface{}, format string, args ...interface{})

pkg/util/log/stdout_logger.go

@@ -380,10 +380,6 @@ func (s *stdoutLogger) SetLevel(level logrus.Level) {
 	s.level = level
 }
 
-func (s *stdoutLogger) GetStream() io.Writer {
-	return os.Stdout
-}
-
 func (s *stdoutLogger) printWithContext(fnType logFunctionType, context map[string]interface{}, args ...interface{}) {
 	s.logMutex.Lock()
 	defer s.logMutex.Unlock()
@@ -406,17 +402,19 @@ func (s *stdoutLogger) printWithContextf(fnType logFunctionType, context map[str
 	}
 }
 
-func (s *stdoutLogger) Write(message string) {
+func (s *stdoutLogger) Write(message []byte) (int, error) {
 	s.logMutex.Lock()
 	defer s.logMutex.Unlock()
 
 	if s.loadingText != nil {
 		s.loadingText.Stop()
 	}
 
-	fnTypeInformationMap[infoFn].stream.Write([]byte(message))
+	n, err := fnTypeInformationMap[infoFn].stream.Write(message)
 
 	if s.loadingText != nil {
 		s.loadingText.Start()
 	}
+
+	return n, err
 }