Merge pull request #690 from bmeneguele/fix-log

Fix logging functions and add tests

internal/logger/logger.go

@@ -80,7 +80,7 @@ func (l *logger) SetStdDest(stdout io.Writer, stderr io.Writer) {
 // printKeysAndValues prints the keys and valus, as pairs, passed to those
 // functions in the way expected by go-retryablehttp LeveledLogger interface
 func printKeysAndValues(l *log.Logger, keysAndValues ...interface{}) {
-	for i := 0; i <= len(keysAndValues)/2; i += 2 {
+	for i := 0; i < len(keysAndValues)/2; i += 2 {
 		l.Printf("\t%s = %s\n", keysAndValues[i], keysAndValues[i+1])
 	}
 }
@@ -116,7 +116,7 @@ func addFileLinePrefix(msg string) string {
 
 // Fatal prints the values and exit the program with os.Exit()
 func (l *logger) Fatal(values ...interface{}) {
-	values = append([]interface{}{addFileLinePrefix("")}, values...)
+	values = append([]interface{}{addFileLinePrefix(" ")}, values...)
 	l.errorLogger.Fatal(values...)
 }
 
@@ -128,7 +128,7 @@ func (l *logger) Fatalf(format string, values ...interface{}) {
 
 // Fatal prints the values in a new line and exit the program with os.Exit()
 func (l *logger) Fatalln(values ...interface{}) {
-	values = append([]interface{}{addFileLinePrefix("")}, values...)
+	values = append([]interface{}{addFileLinePrefix(" ")}, values...)
 	l.errorLogger.Fatalln(values...)
 }
 

internal/logger/logger_test.go

@@ -1,6 +1,9 @@
 package logger
 
 import (
+	"bytes"
+	"io"
+	"os"
 	"regexp"
 	"testing"
 
@@ -37,3 +40,82 @@ func Test_addFileLinePrefix(t *testing.T) {
 	regex := regexp.MustCompile("testing.go:[0-9]+: test")
 	require.Regexp(t, regex, msg)
 }
+
+func TestLogFunctions(t *testing.T) {
+	type logFunc func(string, ...interface{})
+	type logFuncf func(string, ...interface{})
+	type logFuncln func(...interface{})
+
+	log := GetInstance()
+	log.SetLogLevel(LOG_DEBUG)
+
+	tests := []struct {
+		name   string
+		prefix string
+		fn     logFunc
+		fnf    logFuncf
+		fnln   logFuncln
+	}{
+		{
+			name:   "error",
+			prefix: "ERROR:",
+			fn:     log.Error,
+			fnf:    log.Errorf,
+			fnln:   log.Errorln,
+		},
+		{
+			name:   "warn",
+			prefix: "WARNING:",
+			fn:     log.Warn,
+			fnf:    log.Warnf,
+			fnln:   log.Warnln,
+		},
+		{
+			name:   "info",
+			prefix: "",
+			fn:     log.Info,
+			fnf:    log.Infof,
+			fnln:   log.Infoln,
+		},
+		{
+			name:   "debug",
+			prefix: "DEBUG:",
+			fn:     log.Debug,
+			fnf:    log.Debugf,
+			fnln:   log.Debugln,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			// Redirect system stdout to our own so we can check log output
+			// to stdout
+			oldStdout := os.Stdout
+			r, w, err := os.Pipe()
+			if err != nil {
+				t.Errorf("failed to redirect stdout: %s", err)
+			}
+			os.Stdout = w
+			log.SetStdDest(w, w)
+			outChan := make(chan string)
+
+			test.fn("test")
+			test.fnf("test\n")
+			test.fnln("test")
+
+			go func() {
+				var buf bytes.Buffer
+				io.Copy(&buf, r)
+				outChan <- buf.String()
+			}()
+
+			w.Close()
+			os.Stdout = oldStdout
+			out := <-outChan
+
+			regex := regexp.MustCompile(test.prefix + " logger_test.go:[0-9]+: test")
+			require.Regexp(t, regex, out)
+		})
+	}
+
+}