From 0e2db14d32f0cfb7355b564079ee607e9cf5f25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E7=99=BD=E5=8D=97?= <1762386214@qq.com>
Date: Wed, 6 Oct 2021 14:47:58 +0800
Subject: [PATCH] fix(log) fix log with context

---
 pkg/logx/define.go     | 18 +++++++-----------
 pkg/logx/logx.go       | 34 ++++++++++++++++------------------
 pkg/middle-msg/logx.go |  6 ++++++
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkg/logx/define.go b/pkg/logx/define.go
index c7d38b4..7ba2d23 100644
--- a/pkg/logx/define.go
+++ b/pkg/logx/define.go
@@ -1,25 +1,21 @@
 package logx
 
 import (
+	"context"
 	"gitee.com/timedb/wheatCache/pkg/event"
-	middle_msg "gitee.com/timedb/wheatCache/pkg/middle-msg"
 )
 
 type LogLevelState int8
 
 type upLogger struct {
-	produce *event.ProduceInterface
+	produce event.ProduceInterface
 }
 
 type logInterface interface {
-	Debug(msg interface{}) *middle_msg.LogContext
-	Info(msg interface{}) *middle_msg.LogContext
-	Warn(msg interface{}) *middle_msg.LogContext
-	Error(msg interface{}) *middle_msg.LogContext
+	Debug(ctx context.Context, msg interface{})
+	Info(ctx context.Context, msg interface{})
+	Warn(ctx context.Context, msg interface{})
+	Error(ctx context.Context, msg interface{})
 
-	Print(level string, msg interface{}) *middle_msg.LogContext
-}
-
-func NewLogger() *upLogger {
-	return &upLogger{}
+	Print(level string, ctx context.Context, msg interface{})
 }
diff --git a/pkg/logx/logx.go b/pkg/logx/logx.go
index 3097df1..7e6b8db 100644
--- a/pkg/logx/logx.go
+++ b/pkg/logx/logx.go
@@ -1,44 +1,42 @@
 package logx
 
 import (
+	"context"
 	"fmt"
 	"gitee.com/timedb/wheatCache/pkg/event"
-	"gitee.com/timedb/wheatCache/pkg/middle-msg"
+	middleMsg "gitee.com/timedb/wheatCache/pkg/middle-msg"
 	"runtime"
 	"time"
 )
 
-func With(p *event.ProduceInterface) *upLogger {
+func With(p event.ProduceInterface) *upLogger {
 	return &upLogger{
-		p,
+		produce: p,
 	}
 }
 
-func (l *upLogger) Debug(msg interface{}) *middle_msg.LogContext {
-	return l.Print("DEBUG", msg)
+func (l *upLogger) Debug(ctx context.Context, msg interface{}) {
+	l.Print("DEBUG", ctx, msg)
 }
-func (l *upLogger) Info(msg interface{}) *middle_msg.LogContext {
-	return l.Print("INFO", msg)
+func (l *upLogger) Info(ctx context.Context, msg interface{}) {
+	l.Print("INFO", ctx, msg)
 }
-func (l *upLogger) Warn(msg interface{}) *middle_msg.LogContext {
-	return l.Print("WARN", msg)
+func (l *upLogger) Warn(ctx context.Context, msg interface{}) {
+	l.Print("WARN", ctx, msg)
 }
-func (l *upLogger) Error(msg interface{}) *middle_msg.LogContext {
-	return l.Print("ERROR", msg)
+func (l *upLogger) Error(ctx context.Context, msg interface{}) {
+	l.Print("ERROR", ctx, msg)
 }
 
-func (l *upLogger) Print(level string, msg interface{}) *middle_msg.LogContext {
+func (l *upLogger) Print(level string, ctx context.Context, msg interface{}) {
 
 	place := findPlace()
 	datetime := fmt.Sprintf("%s", time.Now())[0:19]
 	fmt.Println(level, datetime, msg, place)
 
-	return &middle_msg.LogContext{
-		Level: level,
-		Data:  time.Now(),
-		Msg:   fmt.Sprintf("%v", msg),
-		Route: place,
-	}
+	eventMiddle := event.NewEvent(middleMsg.EventNameLog)
+	eventMiddle.SetValue(middleMsg.EventKeyLog, middleMsg.LogContext{})
+	l.produce.Call(ctx, eventMiddle)
 }
 
 func Debug(msg interface{}) {
diff --git a/pkg/middle-msg/logx.go b/pkg/middle-msg/logx.go
index 22e8279..67d887d 100644
--- a/pkg/middle-msg/logx.go
+++ b/pkg/middle-msg/logx.go
@@ -2,6 +2,12 @@ package middle_msg
 
 import "time"
 
+var (
+	EventNameLog = "LogContext"
+
+	EventKeyLog = "LogContext"
+)
+
 type LogContext struct {
 	Level string
 	Data  time.Time