Skip to content

Commit

Permalink
feat: optional worker event data uses a map
Browse files Browse the repository at this point in the history
Signed-off-by: Jason Jerome <jajerome@redhat.com>
  • Loading branch information
DuckBoss committed Jul 19, 2023
1 parent 0da66f8 commit d709bf4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
13 changes: 5 additions & 8 deletions internal/work/dispatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,12 @@ func (d *Dispatcher) Connect() error {
}
event.MessageID = eventMessageID

switch ipc.WorkerEventName(eventName) {
case ipc.WorkerEventNameWorking:
eventMessage, ok := s.Body[2].(string)
if !ok {
log.Errorf("cannot convert %T to string", s.Body[2])
continue
}
event.Message = eventMessage
eventMessageData, ok := s.Body[2].(map[string]string)
if !ok {
log.Errorf("cannot convert %T to string map", s.Body[2])
continue
}
event.Message = eventMessageData["message"]

d.WorkerEvents <- event
}
Expand Down
4 changes: 2 additions & 2 deletions ipc/com.redhat.Yggdrasil1.Worker1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Event:
@name: Name of the event.
@message_id: The id associated with the worker message.
@message: Optional message included with the event.
@data: Key-value pairs of optional data provided with the event.
Emitted by a worker when certain conditions arise, such as beginning
or ending work.
Expand All @@ -67,7 +67,7 @@
<signal name="Event">
<arg type="u" name="name" />
<arg type="s" name="message_id" />
<arg type="s" name="message" />
<arg type="a{ss}" name="data" />
</signal>
</interface>

Expand Down
11 changes: 7 additions & 4 deletions worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,14 @@ func (w *Worker) Transmit(addr string, id string, responseTo string, metadata ma
return
}

// EmitEvent emits a WorkerEvent, worker message id, and an optional message.
// EmitEvent emits a WorkerEvent, worker message id, and key-value pairs of optional data.
func (w *Worker) EmitEvent(event ipc.WorkerEventName, messageID string, message string) error {
args := []interface{}{event, messageID}
if message != "" {
args = append(args, message)
args := []interface{}{
event,
messageID,
map[string]string{
"message": message,
},
}
log.Debugf("emitting event %v", event)
return w.conn.Emit(dbus.ObjectPath(path.Join("/com/redhat/Yggdrasil1/Worker1", w.directive)), "com.redhat.Yggdrasil1.Worker1.Event", args...)
Expand Down

0 comments on commit d709bf4

Please sign in to comment.