mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-18 08:16:39 +00:00
Fix auto update success message check
This commit is contained in:
@@ -512,6 +512,13 @@ func (e *Engine) Start(netbirdConfig *mgmProto.NetbirdConfig, mgmtURL *url.URL)
|
|||||||
func (e *Engine) InitialUpdateHandling(autoUpdateSettings *mgmProto.AutoUpdateSettings) {
|
func (e *Engine) InitialUpdateHandling(autoUpdateSettings *mgmProto.AutoUpdateSettings) {
|
||||||
e.syncMsgMux.Lock()
|
e.syncMsgMux.Lock()
|
||||||
defer e.syncMsgMux.Unlock()
|
defer e.syncMsgMux.Unlock()
|
||||||
|
|
||||||
|
if e.updateManager == nil {
|
||||||
|
e.updateManager = updatemanager.NewUpdateManager(e.statusRecorder, e.stateManager)
|
||||||
|
}
|
||||||
|
|
||||||
|
e.updateManager.CheckUpdateSuccess(e.ctx)
|
||||||
|
|
||||||
e.handleAutoUpdateVersion(autoUpdateSettings, true)
|
e.handleAutoUpdateVersion(autoUpdateSettings, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -752,9 +759,8 @@ func (e *Engine) handleAutoUpdateVersion(autoUpdateSettings *mgmProto.AutoUpdate
|
|||||||
if e.updateManager == nil {
|
if e.updateManager == nil {
|
||||||
log.Infof("starting auto-update manager")
|
log.Infof("starting auto-update manager")
|
||||||
e.updateManager = updatemanager.NewUpdateManager(e.statusRecorder, e.stateManager)
|
e.updateManager = updatemanager.NewUpdateManager(e.statusRecorder, e.stateManager)
|
||||||
e.updateManager.Start(e.ctx)
|
|
||||||
}
|
}
|
||||||
|
e.updateManager.Start(e.ctx)
|
||||||
log.Infof("handling auto-update version: %s", autoUpdateSettings.Version)
|
log.Infof("handling auto-update version: %s", autoUpdateSettings.Version)
|
||||||
e.updateManager.SetVersion(autoUpdateSettings.Version)
|
e.updateManager.SetVersion(autoUpdateSettings.Version)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,14 +76,18 @@ func NewUpdateManager(statusRecorder *peer.Status, stateManager *statemanager.Ma
|
|||||||
return manager
|
return manager
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckUpdateSuccess checks if the update was successful. It works without to start the update manager.
|
||||||
|
func (u *UpdateManager) CheckUpdateSuccess(ctx context.Context) {
|
||||||
|
u.updateStateManager(ctx)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func (u *UpdateManager) Start(ctx context.Context) {
|
func (u *UpdateManager) Start(ctx context.Context) {
|
||||||
if u.cancel != nil {
|
if u.cancel != nil {
|
||||||
log.Errorf("UpdateManager already started")
|
log.Errorf("UpdateManager already started")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
u.updateStateManager(ctx)
|
|
||||||
|
|
||||||
u.update.SetDaemonVersion(u.currentVersion)
|
u.update.SetDaemonVersion(u.currentVersion)
|
||||||
u.update.SetOnUpdateListener(func() {
|
u.update.SetOnUpdateListener(func() {
|
||||||
select {
|
select {
|
||||||
|
|||||||
Reference in New Issue
Block a user