From fccdb8caa294ce23634dbf8529944f9aeca5fc62 Mon Sep 17 00:00:00 2001 From: Waldemar Quevedo Date: Thu, 28 Jan 2021 16:17:01 -0800 Subject: [PATCH] js: consumer list request fix Signed-off-by: Waldemar Quevedo --- server/jetstream_cluster.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go index d1be8650..424facfb 100644 --- a/server/jetstream_cluster.go +++ b/server/jetstream_cluster.go @@ -2560,6 +2560,18 @@ func (s *Server) jsClusteredConsumerListRequest(acc *Account, ci *ClientInfo, of defer s.sysUnsubscribe(rsub) // Send out our requests here. + var resp = JSApiConsumerListResponse{ + ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType}, + Consumers: []*ConsumerInfo{}, + } + + if len(consumers) == 0 { + resp.Limit = JSApiListLimit + resp.Offset = offset + s.sendAPIResponse(ci, acc, subject, reply, string(rmsg), s.jsonResponse(resp)) + return + } + for _, ca := range consumers { isubj := fmt.Sprintf(clusterConsumerInfoT, ca.Client.Account, stream, ca.Name) s.sendInternalMsgLocked(isubj, inbox, nil, nil) @@ -2569,11 +2581,6 @@ func (s *Server) jsClusteredConsumerListRequest(acc *Account, ci *ClientInfo, of notActive := time.NewTimer(timeout) defer notActive.Stop() - var resp = JSApiConsumerListResponse{ - ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType}, - Consumers: []*ConsumerInfo{}, - } - LOOP: for { select {