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

Fixed consumer idle hearbeats and JS route/GWs unsubscribes

Browse Source 
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
This commit is contained in:
Ivan Kozlovic
2021-03-09 11:55:47 -07:00
parent ea9abc5ef8
commit ccec4a6ab1
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/client.go
View File

@@ -2744,7 +2744,7 @@ func (c *client) processUnsub(arg []byte) error {
if unsub {
c.unsubscribe(acc, sub, false, true)
if acc != nil && kind == CLIENT || kind == SYSTEM || kind == ACCOUNT {
if acc != nil && (kind == CLIENT || kind == SYSTEM || kind == ACCOUNT || kind == JETSTREAM) {
srv.updateRouteSubscriptionMap(acc, sub, -1)
if updateGWs {
srv.gatewayUpdateSubInterest(acc.Name, sub, -1)

2
server/const.go
View File

@@ -41,7 +41,7 @@ var (
const (
// VERSION is the current version for the server.
VERSION = "2.2.0-RC.7.2"
VERSION = "2.2.0-RC.7.3"
// PROTO is the currently supported protocol.
// 0 was the original

12
server/stream.go
View File

@@ -1007,9 +1007,11 @@ func (mset *stream) processMirrorMsgs() {
}()
// Grab stream quit channel.
mset.mu.RLock()
mset.mu.Lock()
msgs, mch, qch := mset.mirror.msgs, mset.mirror.msgs.mch, mset.qch
mset.mu.RUnlock()
// Set the last seen as now so that we don't fail at the first check.
mset.mirror.last = time.Now()
mset.mu.Unlock()
t := time.NewTicker(sourceHealthCheckInterval)
defer t.Stop()
@@ -1452,9 +1454,11 @@ func (mset *stream) processSourceMsgs(si *sourceInfo) {
}
// Grab stream quit channel.
mset.mu.RLock()
mset.mu.Lock()
msgs, mch, qch := si.msgs, si.msgs.mch, mset.qch
mset.mu.RUnlock()
// Set the last seen as now so that we don't fail at the first check.
si.last = time.Now()
mset.mu.Unlock()
t := time.NewTicker(sourceHealthCheckInterval)
defer t.Stop()