Merge pull request #117 from pinpt/add-rabbitmqbits

Fix log messages, Change QoS

Author: jmull3n

rabbitmq/connectionpool.go

@@ -105,9 +105,11 @@ func (cp *ConnectionPool) GetConnection() (*ConnectionHost, error) {
 func (cp *ConnectionPool) ReturnConnection(connHost *ConnectionHost) {
 	select {
 	case cp.connections <- connHost:
-		log.Debug(cp.logger, "closing connection")
+		log.Debug(cp.logger, "returning connection")
 	default:
 		// pool is full, close passed connection
+		log.Debug(cp.logger, "closing connection")
+
 		connHost.Connection.Close()
 	}
 }

rabbitmq/rabbitmq.go

@@ -82,7 +82,7 @@ func New(logger log.Logger, config Config) *Session {
 
 	// set a default QoS
 	if config.Qos <= 0 {
-		config.Qos = 3
+		config.Qos = 1
 	}
 
 	session := Session{
@@ -254,7 +254,7 @@ func (session *Session) startConsumeLoop(consumergroup string, autoAck bool, exc
 
 			err := session.consumerchannelhost.Channel.Cancel(
 				consumergroup, // Consumer
-				true,          // No-Wait
+				false,          // No-Wait
 			)
 			if err != nil {
 				log.Error(session.logger, "error closing channel on exit", "err", err)