Merge pull request #61 from wework/log-cleanup

log only when messages were sent:
wework · May 5, 2019 · d0bb819 · d0bb819
2 parents eea9d56 + da82ab3
commit d0bb819
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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 {

diff --git a/gbus/worker.go b/gbus/worker.go
@@ -179,14 +179,15 @@ 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)
 			}
 		}
 	}
 
+	worker.log().WithFields(log.Fields{"number_of_handlers": len(handlers)}).Info("found message handlers")
 	return handlers
 }