mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-18 08:16:39 +00:00
Fix state handling
This commit is contained in:
@@ -230,19 +230,16 @@ func (u *UpdateManager) handleUpdate(ctx context.Context) {
|
|||||||
PreUpdateVersion: u.currentVersion,
|
PreUpdateVersion: u.currentVersion,
|
||||||
TargetVersion: updateVersion.String(),
|
TargetVersion: updateVersion.String(),
|
||||||
}
|
}
|
||||||
err := u.stateManager.UpdateState(updateState)
|
|
||||||
if err != nil {
|
if err := u.stateManager.UpdateState(updateState); err != nil {
|
||||||
log.Warnf("failed to update state: %v", err)
|
log.Warnf("failed to update state: %v", err)
|
||||||
} else {
|
} else {
|
||||||
err = u.stateManager.PersistState(ctx)
|
if err = u.stateManager.PersistState(ctx); err != nil {
|
||||||
if err != nil {
|
|
||||||
log.Warnf("failed to persist state: %v", err)
|
log.Warnf("failed to persist state: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = u.triggerUpdate(ctx, updateVersion.String())
|
if err := u.triggerUpdate(ctx, updateVersion.String()); err != nil {
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
log.Errorf("Error triggering auto-update: %v", err)
|
log.Errorf("Error triggering auto-update: %v", err)
|
||||||
u.statusRecorder.PublishEvent(
|
u.statusRecorder.PublishEvent(
|
||||||
cProto.SystemEvent_ERROR,
|
cProto.SystemEvent_ERROR,
|
||||||
@@ -267,10 +264,15 @@ func (u *UpdateManager) updateStateManager(ctx context.Context) {
|
|||||||
log.Errorf("failed to load state: %v", err)
|
log.Errorf("failed to load state: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if u.stateManager.GetState(&UpdateState{}) == nil {
|
state := u.stateManager.GetState(&UpdateState{})
|
||||||
|
if state == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateState, ok := state.(*UpdateState)
|
||||||
|
if !ok {
|
||||||
|
log.Errorf("failed to cast state to UpdateState")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
updateState := u.stateManager.GetState(&UpdateState{}).(*UpdateState)
|
|
||||||
log.Debugf("autoUpdate state loaded, %v", *updateState)
|
log.Debugf("autoUpdate state loaded, %v", *updateState)
|
||||||
if updateState.TargetVersion == u.currentVersion {
|
if updateState.TargetVersion == u.currentVersion {
|
||||||
log.Infof("published notification event")
|
log.Infof("published notification event")
|
||||||
|
|||||||
Reference in New Issue
Block a user