Add message , type in EventStatus struct

openconfig · Jul 17, 2023 · 2102ff9 · 2102ff9
1 parent 7787f68
commit 2102ff9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/events/events.go b/events/events.go
@@ -18,6 +18,8 @@ type EventStatus struct {
 	Name      string // name of event
 	UID       types.UID
 	Namespace string
+	Message   string
+	Type      string
 	Event     corev1.Event // copy of the raw event
 }
 
@@ -110,5 +112,7 @@ func EventToStatus(event *corev1.Event) *EventStatus {
 	}
 	event.DeepCopyInto(&s.Event)
 	event = &s.Event
+	s.Type = event.DeepCopy().Type
+	s.Message = event.DeepCopy().Message
 	return &s
 }
diff --git a/events/status.go b/events/status.go
@@ -122,11 +122,12 @@ func (w *Watcher) display(format string, v ...any) {
 }
 
 func (w *Watcher) displayEvent(s *EventStatus) bool {
-	if w.progress {
-		log.Info(timeNow() + s.Event.String() + "\n")
-	}
+	w.display("NS: %s", s.Namespace)
+	w.display("Event: %s", s.Name)
+	w.display("EventType: %s", s.Type)
+	w.display("Event message: %s", s.Message)
 
-	message := s.Event.Message
+	message := s.Message
 	for _, m := range errorMsgs {
 		// Error out if namespace is currentnamesapce and message contains predefinedcheck namespace
 		if w.currentNamespace == s.Namespace && strings.Contains(message, m) {