diff options
| -rw-r--r-- | worker/types/messages.go | 2 | ||||
| -rw-r--r-- | worker/types/worker.go | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/worker/types/messages.go b/worker/types/messages.go index 0169e05e..4e46cbf4 100644 --- a/worker/types/messages.go +++ b/worker/types/messages.go @@ -34,7 +34,7 @@ func (m Message) getId() int64 { return m.id } -func (m Message) setId(id int64) { +func (m *Message) setId(id int64) { m.id = id } diff --git a/worker/types/worker.go b/worker/types/worker.go index 38140e08..85c19f12 100644 --- a/worker/types/worker.go +++ b/worker/types/worker.go @@ -72,13 +72,17 @@ func (worker *Worker) PostMessage(msg WorkerMessage, func (worker *Worker) ProcessMessage(msg WorkerMessage) WorkerMessage { if resp := msg.InResponseTo(); resp != nil { - worker.Logger.Printf("(ui)<= %T:%T\n", msg, resp) + worker.Logger.Printf("(ui)<= %T(%d):%T(%d)\n", + msg, msg.getId(), resp, resp.getId()) } else { - worker.Logger.Printf("(ui)<= %T\n", msg) + worker.Logger.Printf("(ui)<= %T(%d)\n", msg, msg.getId()) } if inResponseTo := msg.InResponseTo(); inResponseTo != nil { if f, ok := worker.actionCallbacks[inResponseTo.getId()]; ok { f(msg) + if _, ok := msg.(*Done); ok { + delete(worker.actionCallbacks, inResponseTo.getId()) + } } } return msg @@ -86,13 +90,17 @@ func (worker *Worker) ProcessMessage(msg WorkerMessage) WorkerMessage { func (worker *Worker) ProcessAction(msg WorkerMessage) WorkerMessage { if resp := msg.InResponseTo(); resp != nil { - worker.Logger.Printf("<-(ui) %T:%T\n", msg, resp) + worker.Logger.Printf("<-(ui) %T(%d):%T(%d)\n", + msg, msg.getId(), resp, resp.getId()) } else { - worker.Logger.Printf("<-(ui) %T\n", msg) + worker.Logger.Printf("<-(ui) %T(%d)\n", msg, msg.getId()) } if inResponseTo := msg.InResponseTo(); inResponseTo != nil { if f, ok := worker.messageCallbacks[inResponseTo.getId()]; ok { f(msg) + if _, ok := msg.(*Done); ok { + delete(worker.messageCallbacks, inResponseTo.getId()) + } } } return msg |