From 01230dee107b01eb36f5c8c06de1207bde93dd2d Mon Sep 17 00:00:00 2001 From: Guy Baron Date: Sun, 5 May 2019 17:41:51 +0300 Subject: [PATCH 1/2] log only when messages were sent: --- gbus/tx/mysql/txoutbox.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gbus/tx/mysql/txoutbox.go b/gbus/tx/mysql/txoutbox.go index 9f547b2..7bc8108 100644 --- a/gbus/tx/mysql/txoutbox.go +++ b/gbus/tx/mysql/txoutbox.go @@ -285,7 +285,9 @@ func (outbox *TxOutbox) sendMessages(recordSelector func(tx *sql.Tx) (*sql.Rows, if err != nil { outbox.log().WithError(err).Error("could not close Rows") } - outbox.log().WithField("messages_sent", len(successfulDeliveries)).Info("outbox relayed messages") + if messagesSent := len(successfulDeliveries); messagesSent > 0 { + outbox.log().WithField("messages_sent", len(successfulDeliveries)).Info("outbox relayed messages") + } for deliveryTag, id := range successfulDeliveries { _, updateErr := tx.Exec("UPDATE "+getOutboxName(outbox.svcName)+" SET status=1, delivery_tag=?, relay_id=? WHERE rec_id=?", deliveryTag, outbox.ID, id) if updateErr != nil { From da82ab36837b2f9d3f31468f48416ed8d0867f1a Mon Sep 17 00:00:00 2001 From: Guy Baron Date: Sun, 5 May 2019 17:45:13 +0300 Subject: [PATCH 2/2] fixed logging of resolved handlers --- gbus/worker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gbus/worker.go b/gbus/worker.go index c864143..d38cc64 100644 --- a/gbus/worker.go +++ b/gbus/worker.go @@ -179,7 +179,7 @@ func (worker *worker) resolveHandlers(isRPCreply bool, bm *BusMessage, delivery } else { worker.handlersLock.Lock() defer worker.handlersLock.Unlock() - worker.log().WithFields(log.Fields{"number_of_handlers": len(worker.registrations)}).Info("found message handlers") + for _, registration := range worker.registrations { if registration.Matches(delivery.Exchange, delivery.RoutingKey, bm.PayloadFQN) { handlers = append(handlers, registration.Handler) @@ -187,6 +187,7 @@ func (worker *worker) resolveHandlers(isRPCreply bool, bm *BusMessage, delivery } } + worker.log().WithFields(log.Fields{"number_of_handlers": len(handlers)}).Info("found message handlers") return handlers }