[glog] Add missing space between message and fields

elgopher · Jan 29, 2022 · 316baad · 316baad
1 parent f8c4d9c
commit 316baad
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 8 deletions.
diff --git a/adapter/glogadapter/glog.go b/adapter/glogadapter/glog.go
@@ -36,14 +36,14 @@ func (a Adapter) Log(_ context.Context, entry logger.Entry) {
 
 	switch entry.Level {
 	case logger.DebugLevel:
-		glog.InfoDepth(depth, message, fieldsAndErrorString)
+		glog.InfoDepth(depth, message, " ", fieldsAndErrorString)
 	case logger.InfoLevel:
-		glog.InfoDepth(depth, message, fieldsAndErrorString)
+		glog.InfoDepth(depth, message, " ", fieldsAndErrorString)
 	case logger.WarnLevel:
-		glog.WarningDepth(depth, message, fieldsAndErrorString)
+		glog.WarningDepth(depth, message, " ", fieldsAndErrorString)
 	case logger.ErrorLevel:
-		glog.ErrorDepth(depth, message, fieldsAndErrorString)
+		glog.ErrorDepth(depth, message, " ", fieldsAndErrorString)
 	default:
-		glog.InfoDepth(depth, message, fieldsAndErrorString)
+		glog.InfoDepth(depth, message, " ", fieldsAndErrorString)
 	}
 }
diff --git a/adapter/glogadapter/glog_test.go b/adapter/glogadapter/glog_test.go
@@ -13,6 +13,8 @@ import (
 )
 
 func TestAdapter_Log(t *testing.T) {
+	const message = "message"
+
 	t.Run("should log caller", func(t *testing.T) {
 		stderr := useFakeStderr(t)
 		defer stderr.Release()
@@ -21,7 +23,7 @@ func TestAdapter_Log(t *testing.T) {
 		// when
 		adapter.Log(context.Background(), logger.Entry{
 			Level:   logger.ErrorLevel,
-			Message: "message",
+			Message: message,
 		})
 		// then
 		msg := unmarshalLine(t, stderr.FirstLine(t))
@@ -30,6 +32,42 @@ func TestAdapter_Log(t *testing.T) {
 			strings.HasPrefix(msg.caller, expectedPrefix),
 			"caller %s has no prefix %s", msg.caller, expectedPrefix)
 	})
+
+	t.Run("should log message", func(t *testing.T) {
+		stderr := useFakeStderr(t)
+		defer stderr.Release()
+
+		adapter := glogadapter.Adapter{}
+		// when
+		adapter.Log(context.Background(), logger.Entry{
+			Level:   logger.ErrorLevel,
+			Message: message,
+		})
+		// then
+		msg := unmarshalLine(t, stderr.FirstLine(t))
+		assert.Equal(t, "E", msg.level)
+		assert.Equal(t, message, msg.message)
+	})
+
+	t.Run("should log message with field", func(t *testing.T) {
+		stderr := useFakeStderr(t)
+		defer stderr.Release()
+
+		adapter := glogadapter.Adapter{}
+		// when
+		entry := logger.Entry{
+			Level:   logger.ErrorLevel,
+			Message: message,
+		}.With(logger.Field{
+			Key:   "k",
+			Value: "v",
+		})
+		adapter.Log(context.Background(), entry)
+		// then
+		msg := unmarshalLine(t, stderr.FirstLine(t))
+		assert.Equal(t, "k=v", msg.fields)
+		assert.Equal(t, message, msg.message)
+	})
 }
 
 func unmarshalLine(t *testing.T, line string) glogMessage {
@@ -45,11 +83,18 @@ func unmarshalLine(t *testing.T, line string) glogMessage {
 	caller := parts[3]
 	caller = caller[:len(caller)-1]
 
+	message := parts[4]
+
+	fields := parts[5]
+	if len(fields) > 0 {
+		fields = fields[:len(fields)-1]
+	}
+
 	return glogMessage{
 		caller:  caller,
 		level:   level,
-		message: parts[4],
-		fields:  parts[5],
+		message: message,
+		fields:  fields,
 	}
 }