feat: Cmd2Value carry caller

openimsdk · Sep 27, 2024 · d3ede48 · d3ede48
1 parent 5b64e79
commit d3ede48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/conversation_msg/notification.go b/internal/conversation_msg/notification.go
@@ -191,6 +191,9 @@ func (c *Conversation) getConversationLatestMsgClientID(latestMsg string) string
 }
 
 func (c *Conversation) doUpdateConversation(c2v common.Cmd2Value) {
+	if c2v.Caller == "" {
+		c2v.Caller = common.GetCaller(3)
+	}
 	ctx := c2v.Ctx
 	node := c2v.Value.(common.UpdateConNode)
 	log.ZInfo(ctx, "doUpdateConversation", "node", node)

diff --git a/pkg/common/cmd.go b/pkg/common/cmd.go
@@ -32,7 +32,7 @@ type Cmd2Value struct {
 
 func sendCmd(ch chan<- Cmd2Value, value Cmd2Value, timeout time.Duration) error {
 	if value.Caller == "" {
-		value.Caller = getFuncName()
+		value.Caller = GetCaller(3)
 	}
 	log.ZDebug(value.Ctx, "sendCmd chan success", "caller", value.Caller, "cmd", value.Cmd, "value", value.Value)
 	if ch == nil {
@@ -51,8 +51,8 @@ func sendCmd(ch chan<- Cmd2Value, value Cmd2Value, timeout time.Duration) error
 	}
 }
 
-func getFuncName() string {
-	pc, _, line, ok := runtime.Caller(3)
+func GetCaller(skip int) string {
+	pc, _, line, ok := runtime.Caller(skip)
 	if !ok {
 		return "runtime.caller.failed"
 	}