From b4e81575be366cee43f9c2296821a92e4ef6ee51 Mon Sep 17 00:00:00 2001 From: Sanket Deshpande Date: Fri, 20 Jul 2018 11:36:38 -0500 Subject: [PATCH 1/9] do not delete topic from msgRouter after unsubscribe --- client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client.go b/client.go index 03355b7b..c6dc66b5 100644 --- a/client.go +++ b/client.go @@ -639,9 +639,9 @@ func (c *client) Unsubscribe(topics ...string) Token { copy(unsub.Topics, topics) c.oboundP <- &PacketAndToken{p: unsub, t: token} - for _, topic := range topics { - c.msgRouter.deleteRoute(topic) - } + // for _, topic := range topics { + // c.msgRouter.deleteRoute(topic) + // } DEBUG.Println(CLI, "exit Unsubscribe") return token From f97bfdcb0a62b4bff8bf010089a2b3791043212a Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Wed, 14 Sep 2022 15:13:42 -0500 Subject: [PATCH 2/9] debug print --- message.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/message.go b/message.go index 4bbf4917..bec3f095 100644 --- a/message.go +++ b/message.go @@ -15,6 +15,7 @@ package mqtt import ( + "fmt" "github.com/eclipse/paho.mqtt.golang/packets" ) @@ -95,6 +96,7 @@ func newConnectMsgFromOptions(options *ClientOptions) *packets.ConnectPacket { } if username != "" { + fmt.Printf("USERNAME: %q\n", username) m.UsernameFlag = true m.Username = username //mustn't have password without user as well From 5fd3a422bbeb7e702b157fe5b7a88cb0a3b2358e Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Mon, 19 Sep 2022 08:34:46 -0500 Subject: [PATCH 3/9] debug print --- message.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/message.go b/message.go index bec3f095..7699735d 100644 --- a/message.go +++ b/message.go @@ -104,6 +104,8 @@ func newConnectMsgFromOptions(options *ClientOptions) *packets.ConnectPacket { m.PasswordFlag = true m.Password = []byte(password) } + } else { + fmt.Printf("NO USERNAME\n") } m.Keepalive = uint16(options.KeepAlive) From 486698392217eb5e18d529d50420c47c0d7dd9b7 Mon Sep 17 00:00:00 2001 From: Martin Pandola Date: Mon, 7 Nov 2022 16:11:38 -0600 Subject: [PATCH 4/9] rm github stuff --- .github/workflows/codeql-analysis.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 4cbfc309..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [ master ] - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: 'go' - - - name: CodeQL Analysis - uses: github/codeql-action/analyze@v1 From 558038c7f9adc2eadfcf506216582855dc2bc48c Mon Sep 17 00:00:00 2001 From: Martin Pandola Date: Mon, 7 Nov 2022 16:18:03 -0600 Subject: [PATCH 5/9] fix go mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index beb19918..97ca49ef 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/eclipse/paho.mqtt.golang +module github.com/clearblade/paho.mqtt.golang go 1.14 From b05425cf7ac305b301c949dcd9c61f09e9f573fa Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Mon, 17 Feb 2025 12:30:38 -0600 Subject: [PATCH 6/9] test --- go.mod | 7 ++++--- go.sum | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ping.go | 2 +- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 97ca49ef..6c085758 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module github.com/clearblade/paho.mqtt.golang go 1.14 require ( - github.com/gorilla/websocket v1.4.2 - golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect + github.com/gorilla/websocket v1.5.3 + golang.org/x/net v0.27.0 + golang.org/x/sync v0.7.0 ) diff --git a/go.sum b/go.sum index 4ce755ba..731a96dc 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,75 @@ +github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= +github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U= golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/ping.go b/ping.go index 857aa0ea..26ff8a6c 100644 --- a/ping.go +++ b/ping.go @@ -69,7 +69,7 @@ func keepalive(c *client, conn io.Writer) { } } if atomic.LoadInt32(&c.pingOutstanding) > 0 && time.Since(pingSent) >= c.options.PingTimeout { - CRITICAL.Println(PNG, "pingresp not received, disconnecting") + CRITICAL.Println(PNG, "pingresp NOT received, disconnecting") c.internalConnLost(errors.New("pingresp not received, disconnecting")) // no harm in calling this if the connection is already down (or shutdown is in progress) return } From 002ad7fff2b899a1182de222b617f540076d226e Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Mon, 17 Feb 2025 13:14:17 -0600 Subject: [PATCH 7/9] added options to CRITICAL log so we know info about the connection --(client id, etc) --- go.mod | 2 +- go.sum | 2 ++ ping.go | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6c085758..01ff6daa 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/clearblade/paho.mqtt.golang go 1.14 require ( - github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect + github.com/eclipse/paho.mqtt.golang v1.5.0 github.com/gorilla/websocket v1.5.3 golang.org/x/net v0.27.0 golang.org/x/sync v0.7.0 diff --git a/go.sum b/go.sum index 731a96dc..e0e7d9bf 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,7 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= @@ -35,6 +36,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/ping.go b/ping.go index 26ff8a6c..7f992602 100644 --- a/ping.go +++ b/ping.go @@ -20,6 +20,7 @@ package mqtt import ( "errors" + "fmt" "io" "sync/atomic" "time" @@ -69,7 +70,7 @@ func keepalive(c *client, conn io.Writer) { } } if atomic.LoadInt32(&c.pingOutstanding) > 0 && time.Since(pingSent) >= c.options.PingTimeout { - CRITICAL.Println(PNG, "pingresp NOT received, disconnecting") + CRITICAL.Println(PNG, fmt.Sprintf("pingresp no received for %+v, disconnecting", c.options)) c.internalConnLost(errors.New("pingresp not received, disconnecting")) // no harm in calling this if the connection is already down (or shutdown is in progress) return } From b870fa387c50eb4f6597c17a9f0e1eaae7389233 Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Tue, 18 Feb 2025 07:11:43 -0600 Subject: [PATCH 8/9] made a better log statement to include client id up front --- ping.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ping.go b/ping.go index 7f992602..660593e1 100644 --- a/ping.go +++ b/ping.go @@ -70,7 +70,7 @@ func keepalive(c *client, conn io.Writer) { } } if atomic.LoadInt32(&c.pingOutstanding) > 0 && time.Since(pingSent) >= c.options.PingTimeout { - CRITICAL.Println(PNG, fmt.Sprintf("pingresp no received for %+v, disconnecting", c.options)) + CRITICAL.Println(PNG, fmt.Sprintf("%s: pingresp no received for %+v, disconnecting", c.options.ClientID, c.options)) c.internalConnLost(errors.New("pingresp not received, disconnecting")) // no harm in calling this if the connection is already down (or shutdown is in progress) return } From def575eed97a90ee461a8f89a3640a9e5b8b7310 Mon Sep 17 00:00:00 2001 From: Steve Manweiler Date: Tue, 18 Feb 2025 07:15:04 -0600 Subject: [PATCH 9/9] fixed bad CONNACK log --- client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.go b/client.go index 7f755d7a..12682898 100644 --- a/client.go +++ b/client.go @@ -413,7 +413,7 @@ func (c *client) attemptConnection() (net.Conn, byte, bool, error) { goto CONN } if c.options.protocolVersionExplicit { // to maintain logging from previous version - ERROR.Println(CLI, "Connecting to", broker, "CONNACK was not CONN_ACCEPTED, but rather", packets.ConnackReturnCodes[rc]) + ERROR.Println(CLI, "Connecting to", broker, fmt.Sprintf("%s: CONNACK was not CONN_ACCEPTED, but rather %s", c.options.ClientID, packets.ConnackReturnCodes[rc])) } } // If the connection was successful we set member variable and lock in the protocol version for future connection attempts (and users)