1 parent
48f4b24781
commit
a045a0cd17
27 files changed
+1209
-24
No files matched your search
@@ -78,7 +78,7 @@ func (m *ConfigManager) ManagePending(ctx context.Context, generation uint64, id
|
||||
return err
|
||||
}
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
activeSSL := m.current.SSL.TLS
|
||||
if cancel {
|
||||
m.pending = nil
|
||||
m.status.PendingRestart = append([]ServiceName(nil), pending.PreviousRestart...)
|
||||
@@ -86,5 +86,10 @@ func (m *ConfigManager) ManagePending(ctx context.Context, generation uint64, id
|
||||
m.pending.Actor = actor
|
||||
m.pending.Confirmation = confirmation
|
||||
}
|
||||
m.mu.Unlock()
|
||||
if cancel {
|
||||
releaseManagedSSL(m.loader.root, pending.Candidate.SSL.TLS)
|
||||
maintainManagedSSL(m.loader.root, activeSSL)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user