From 2eb211d876ef3e95dfaa6eecdb2349e96c41411c Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 28 Jun 2019 15:56:22 +0800 Subject: [PATCH] Revert "test" This reverts commit ddf0207ae339b5e157af94c5dbb2796051302547. --- def.go | 2 +- mq.go | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/def.go b/def.go index 38f76f8..c0053a8 100644 --- a/def.go +++ b/def.go @@ -28,7 +28,7 @@ type MQSession struct { Queue string MQConnection *amqp.Connection MQChannel *amqp.Channel - MQQueue *amqp.Queue + MQQueue amqp.Queue MQDelivery <-chan amqp.Delivery isConnected bool } diff --git a/mq.go b/mq.go index f2764ab..d1c25c6 100644 --- a/mq.go +++ b/mq.go @@ -14,8 +14,7 @@ func (s MQSession) Open() error { } if s.SSL == false { - conn, err := amqp.Dial("amqp://" + s.User + ":" + s.Password + "@" + s.Host + "/" + s.Path) - s.MQConnection = conn + s.MQConnection, err = amqp.Dial("amqp://" + s.User + ":" + s.Password + "@" + s.Host + "/" + s.Path) } else { return errors.New("SSL connection not implemented") } @@ -24,15 +23,14 @@ func (s MQSession) Open() error { s.MQConnection.Close() return err } - ch, err := s.MQConnection.Channel() - s.MQChannel = ch + s.MQChannel, err = s.MQConnection.Channel() logOnError(err, "Open : Failed to open channel") if err != nil { s.MQChannel.Close() s.MQConnection.Close() return err } - q, err := s.MQChannel.QueueDeclare( + s.MQQueue, err = s.MQChannel.QueueDeclare( s.Queue, // name false, // durable false, // delete when unused @@ -41,7 +39,6 @@ func (s MQSession) Open() error { nil, // arguments ) - s.MQQueue = q logOnError(err, "Open : Failed to declare queue") if err != nil { s.MQChannel.Close()