From 19e33ee958b10cf920ceddc70b646252ef9ba4da Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 28 Jun 2019 15:56:55 +0800 Subject: [PATCH] Revert "test" This reverts commit 8957a372d995f17fd5069416f9f528ad1c54e05f. --- client.go | 7 +++++-- mq.go | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client.go b/client.go index 6b6d690..2c5ccc3 100644 --- a/client.go +++ b/client.go @@ -9,9 +9,12 @@ import ( func clientKeepAlive(k, v interface{}) bool { clt := v.(*MQKeepAlive) if clt.Date.Add(3 * KeepAliveHeartBeatSeconds * time.Second).Before(time.Now()) { - msgs, err := clientsQueue[clt.UserID64].MQChannel.QueuePurge(clientsQueue[clt.UserID64].Queue.Name, false) + msgs, err := clientsQueue[clt.UserID64].Channel.QueuePurge(clientsQueue[clt.UserID64].Queue.Name, false) logOnError(err, "clientKeepAlive : Channel.QueuePurge()") - clientsQueue[clt.UserID64].Close() + err = clientsQueue[clt.UserID64].Channel.Close() + logOnError(err, "clientKeepAlive : Channel.Close()") + err = clientsQueue[clt.UserID64].Connection.Close() + logOnError(err, "clientKeepAlive : Connection.Close()") c := TGCommand{ Type: commandSendMsg, ToUserID64: clt.UserID64, diff --git a/mq.go b/mq.go index 02fd9d0..6ab4ae2 100644 --- a/mq.go +++ b/mq.go @@ -7,13 +7,12 @@ import ( ) func (s MQSession) Open() error { - var err error if s.isConnected { return errors.New("Session is already connected.") } - if SSL == false { - s.MQConnection, err = amqp.Dial("amqp://" + s.User + ":" + s.Password + "@" + s.Host + "/" + s.Path) + if SLL == false { + s.MQConnection, err = amqp.Dial("amqp://" + Session.User + ":" + Session.Password + "@" + Session.Host + "/" + Session.Path) } else { return errors.New("SSL connection not implemented") }