Optimize the event json struct to nsq

nbtca · Mar 24, 2024 · e651000 · e651000
1 parent 0f94b39
commit e651000
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/util/event-action.go b/util/event-action.go
@@ -194,29 +194,30 @@ func (eh *eventActionHandler) Handle() model.EventLog {
 	} else {
 		eventLog = eh.createEventLog(createEventLogArgs{})
 	}
-	logger := getLogger()
-	if producer := GetNSQProducer(); producer != nil {
-		mapEventLog := map[string]interface{}{
-			"event_id":    eventLog.EventId,
-			"action":      eventLog.Action,
-			"member_id":   eventLog.MemberId,
-			"gmt_create":  eventLog.GmtCreate,
-			"description": eventLog.Description,
-			"data":        eh.event,
-		}
-		jsonMap, _ := json.Marshal(mapEventLog)
-		producer.PublishAsync(EventTopic, jsonMap, nil)
-		// logger.Hooks.Add(&NSQHookForEvent{
-		// 	Producer: producer,
-		// })
-	}
-	logger.WithFields(logrus.Fields{
+
+	Logger.WithFields(logrus.Fields{
 		"event_id":    eventLog.EventId,
 		"action":      eventLog.Action,
 		"member_id":   eventLog.MemberId,
 		"gmt_create":  eventLog.GmtCreate,
 		"description": eventLog.Description,
 	}).Info("new event action")
+
+	if producer := GetNSQProducer(); producer != nil {
+		mapEventLog := map[string]interface{}{
+			"event_id":     eventLog.EventId,
+			"action":       eventLog.Action,
+			"member_id":    eventLog.MemberId,
+			"member_alias": eh.event.Member.Alias,
+			"problem":      eh.event.Problem,
+			"model":        eh.event.Model,
+			"gmt_create":   eventLog.GmtCreate,
+			"description":  eventLog.Description,
+		}
+		jsonMap, _ := json.Marshal(mapEventLog)
+		producer.PublishAsync(EventTopic, jsonMap, nil)
+	}
+
 	return eventLog
 }