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 branch 'main' into dev

Browse Source
This commit is contained in:
Derek Collison
2023-05-15 15:44:38 -07:00
parent e07ccf9cc1 9434110c05
commit 4220502541
9 changed files with 447 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/events.go
View File

@@ -1363,6 +1363,13 @@ func (s *Server) remoteServerUpdate(sub *subscription, c *client, _ *Account, su
}
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.
if !s.sameDomain(si.Domain) {
return
@@ -1388,11 +1395,6 @@ func (s *Server) remoteServerUpdate(sub *subscription, c *client, _ *Account, su
stats,
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.