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 #2757 from nats-io/sys-acc-err

Browse Source 
Fixed system account issue where the wrong struct got updated
This commit is contained in:
Matthias Hanel
2021-12-23 12:13:25 -05:00
committed by GitHub
parent 91042b399f fe5f47f43b
commit 42ae3f5325
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/server.go
View File

@@ -466,7 +466,7 @@ func NewServer(opts *Options) (*Server, error) {
}
// For other resolver:
// In operator mode, when the account resolver depends on an external system and
// the system account can't fetched, inject a temporary one.
// the system account can't be fetched, inject a temporary one.
if ar := s.accResolver; len(opts.TrustedOperators) == 1 && ar != nil &&
opts.SystemAccount != _EMPTY_ && opts.SystemAccount != DEFAULT_SYSTEM_ACCOUNT {
if _, ok := ar.(*MemAccResolver); !ok {
@@ -474,7 +474,7 @@ func NewServer(opts *Options) (*Server, error) {
var a *Account
// perform direct lookup to avoid warning trace
if _, err := fetchAccount(ar, s.opts.SystemAccount); err == nil {
a, _ = s.fetchAccount(s.opts.SystemAccount)
a, _ = s.lookupAccount(s.opts.SystemAccount)
}
s.mu.Lock()
if a == nil {
@@ -1635,10 +1635,10 @@ func (s *Server) Start() {
case <-s.quitCh:
return
case <-t.C:
if _, err := fetchAccount(ar, s.opts.SystemAccount); err != nil {
sacc := s.SystemAccount()
if claimJWT, err := fetchAccount(ar, s.opts.SystemAccount); err != nil {
continue
}
if _, err := s.fetchAccount(s.opts.SystemAccount); err != nil {
} else if err = s.updateAccountWithClaimJWT(sacc, claimJWT); err != nil {
continue
}
s.Noticef("System account fetched and updated")