gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2348 from nats-io/sys-hdr

Browse Source 
[fixed] CONNS system endpoint which had issues with header and empty msg
This commit is contained in:
Ivan Kozlovic
2021-07-06 14:49:00 -06:00
committed by GitHub
parent 315e658a5f fcb3382f4b
commit 6ad6c6ae4b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/events.go
View File

@@ -1043,7 +1043,7 @@ func (s *Server) shutdownEventing() {
}
// Request for our local connection count.
func (s *Server) connsRequest(sub *subscription, _ *client, subject, reply string, msg []byte) {
func (s *Server) connsRequest(sub *subscription, c *client, subject, reply string, rmsg []byte) {
if !s.eventsRunning() {
return
}
@@ -1054,9 +1054,11 @@ func (s *Server) connsRequest(sub *subscription, _ *client, subject, reply strin
}
a := tk[accReqAccIndex]
m := accNumConnsReq{Account: a}
if err := json.Unmarshal(msg, &m); err != nil {
s.sys.client.Errorf("Error unmarshalling account connections request message: %v", err)
return
if _, msg := c.msgParts(rmsg); len(msg) > 0 {
if err := json.Unmarshal(msg, &m); err != nil {
s.sys.client.Errorf("Error unmarshalling account connections request message: %v", err)
return
}
}
if m.Account != a {
s.sys.client.Errorf("Error unmarshalled account does not match subject")