[YUNIKORN-1097] ERMProxy DEBUG cannot log event with channel

steinsgateted · Mar 1, 2022 · 366fce8 · 366fce8
1 parent c61bf9a
commit 366fce8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/rmproxy/rmevent/events.go b/pkg/rmproxy/rmevent/events.go
@@ -106,36 +106,36 @@ func GetEventWithoutChan(ev interface{}) interface{} {
 	switch v := ev.(type) {
 	case *RMRegistrationEvent:
 		c := <-v.Channel
-		m["RMRegistrationEvent"] = map[string]interface{}{
+		m = map[string]interface{}{
 			"Registration": v.Registration,
 			"Channel":      c,
 		}
 		return m
 	case *RMConfigUpdateEvent:
 		c := <-v.Channel
-		m["RMConfigUpdateEvent"] = map[string]interface{}{
+		m = map[string]interface{}{
 			"RmID":    v.RmID,
 			"Channel": c,
 		}
 		return m
 	case *RMPartitionsRemoveEvent:
 		c := <-v.Channel
-		m["RMPartitionsRemoveEvent"] = map[string]interface{}{
+		m = map[string]interface{}{
 			"RmID":    v.RmID,
 			"Channel": c,
 		}
 		return m
 	case *RMNewAllocationsEvent:
 		c := <-v.Channel
-		m["RMNewAllocationsEvent"] = map[string]interface{}{
+		m = map[string]interface{}{
 			"RmID":        v.RmID,
 			"Allocations": v.Allocations,
 			"Channel":     c,
 		}
 		return m
 	case *RMReleaseAllocationEvent:
 		c := <-v.Channel
-		m["RMPartitionsRemoveEvent"] = map[string]interface{}{
+		m = map[string]interface{}{
 			"RmID":                v.RmID,
 			"ReleasedAllocations": v.ReleasedAllocations,
 			"Channel":             c,

diff --git a/pkg/rmproxy/rmproxy.go b/pkg/rmproxy/rmproxy.go
@@ -62,6 +62,7 @@ func enqueueAndCheckFull(queue chan interface{}, ev interface{}) {
 	select {
 	case queue <- ev:
 		log.Logger().Debug("enqueue event",
+			zap.String("eventType", reflect.TypeOf(ev).String()),
 			zap.Any("event", rmevent.GetEventWithoutChan(ev)),
 			zap.Int("currentQueueSize", len(queue)))
 	default: