#778: feat(refactor): jobs code adjustingv2.4.0

#778: feat(refactor): jobs code adjusting

1 files changed, 9 insertions, 12 deletions

diff --git a/plugins/amqp/amqpjobs/redial.go b/plugins/amqp/amqpjobs/redial.go
index 8d21784f..698a34a6 100644
--- a/plugins/amqp/amqpjobs/redial.go
+++ b/plugins/amqp/amqpjobs/redial.go
@@ -113,25 +113,22 @@ func (c *consumer) redialer() { //nolint:gocognit
 				c.Unlock()
 
 			case <-c.stopCh:
-				if c.publishChan != nil {
-					pch := <-c.publishChan
-					err := pch.Close()
-					if err != nil {
-						c.log.Error("publish channel close", "error", err)
-					}
+				pch := <-c.publishChan
+				err := pch.Close()
+				if err != nil {
+					c.log.Error("publish channel close", "error", err)
 				}
 
 				if c.consumeChan != nil {
-					err := c.consumeChan.Close()
+					err = c.consumeChan.Close()
 					if err != nil {
 						c.log.Error("consume channel close", "error", err)
 					}
 				}
-				if c.conn != nil {
-					err := c.conn.Close()
-					if err != nil {
-						c.log.Error("amqp connection close", "error", err)
-					}
+
+				err = c.conn.Close()
+				if err != nil {
+					c.log.Error("amqp connection close", "error", err)
 				}
 
 				return