amqp broker: do not attempt to create a channel if no connection is a…

…live
lukasjarosch · Jul 21, 2020 · 87aa2d4 · 87aa2d4
1 parent d88d85a
commit 87aa2d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/broker/amqp/broker.go b/broker/amqp/broker.go
@@ -88,7 +88,7 @@ func (b *Broker) Consume(wg *sync.WaitGroup) {
  channel, err := b.consumeConn.Channel()
  if err != nil {
  logger.Warnf("unable to fetch AMQP channel for consumer: %s", err.Error())
- time.Sleep(500 * time.Millisecond)
+ time.Sleep(300 * time.Millisecond)
  continue
  }
 

diff --git a/broker/amqp/connection.go b/broker/amqp/connection.go
@@ -166,6 +166,10 @@ func (c *Connection) setConnected(status bool) {
 }
 
 func (c *Connection) Channel() (channel *amqp.Channel, err error) {
+ if !c.IsConnected() {
+ return nil, fmt.Errorf("amqp connection not alive")
+ }
+
  c.connMutex.Lock()
  defer c.connMutex.Unlock()