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 #2078 from nats-io/mirror_panic

Browse Source 
If a mirror was removed or changed this would panic.
This commit is contained in:
Derek Collison
2021-04-07 14:26:56 -07:00
committed by GitHub
parent 74a051e3a8 114431bb3c
commit 2bea1f64f5
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/stream.go
View File

@@ -1292,7 +1292,9 @@ func (mset *stream) processInboundMirrorMsg(m *inMsg) bool {
func (mset *stream) setMirrorErr(err *ApiError) {
mset.mu.Lock()
mset.mirror.err = err
if mset.mirror != nil {
mset.mirror.err = err
}
mset.mu.Unlock()
}
@@ -1421,16 +1423,22 @@ func (mset *stream) setupMirrorConsumer() error {
if ccr.Error != nil || ccr.ConsumerInfo == nil {
mset.cancelMirrorConsumer()
} else {
// Capture consumer name.
mset.mu.Lock()
if mset.mirror != nil {
mset.mirror.cname = ccr.ConsumerInfo.Name
// Mirror config has been removed.
if mset.mirror == nil {
mset.mu.Unlock()
mset.cancelMirrorConsumer()
return
}
// Capture consumer name.
mset.mirror.cname = ccr.ConsumerInfo.Name
msgs := mset.mirror.msgs
// Process inbound mirror messages from the wire.
sub, err := mset.subscribeInternal(deliverSubject, func(sub *subscription, c *client, subject, reply string, rmsg []byte) {
hdr, msg := c.msgParts(append(rmsg[:0:0], rmsg...)) // Need to copy.
mset.queueInbound(mset.mirror.msgs, subject, reply, hdr, msg)
mset.queueInbound(msgs, subject, reply, hdr, msg)
})
if err != nil {
mset.mirror.err = jsError(err)