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

If a NATS system has multiple domains make sure to process those during a remote update before bailing.

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2023-05-13 18:36:42 -07:00
parent a982bbcb73
commit 75d274a636
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/events.go
View File

@@ -1268,6 +1268,13 @@ func (s *Server) remoteServerUpdate(sub *subscription, c *client, _ *Account, su
} }
si := ssm.Server si := ssm.Server
// Should do normal updates before bailing if wrong domain.
s.mu.Lock()
if s.running && s.eventsEnabled() && ssm.Server.ID != s.info.ID {
s.updateRemoteServer(&si)
}
s.mu.Unlock()
// JetStream node updates. // JetStream node updates.
if !s.sameDomain(si.Domain) { if !s.sameDomain(si.Domain) {
return return
@@ -1293,11 +1300,6 @@ func (s *Server) remoteServerUpdate(sub *subscription, c *client, _ *Account, su
stats, stats,
false, si.JetStream, false, si.JetStream,
}) })
s.mu.Lock()
if s.running && s.eventsEnabled() && ssm.Server.ID != s.info.ID {
s.updateRemoteServer(&si)
}
s.mu.Unlock()
} }
// updateRemoteServer is called when we have an update from a remote server. // updateRemoteServer is called when we have an update from a remote server.