Skip to content

Reset upgrade state when upgraded #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2022
Merged

Reset upgrade state when upgraded #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/update/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
type state struct {
Message string `json:"message"`
LastChecked time.Time `json:"lastChecked"`
Version string `json:"version"`
}

// loadState loads the update check state from disk, returning defaults if it does not exist
Expand Down
18 changes: 13 additions & 5 deletions pkg/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,23 @@ func DisplayAndCheckForRelease() error {
return fmt.Errorf("update check disabled")
}

state, err := loadState()
s, err := loadState()
if err != nil {
return err
}
if time.Since(state.LastChecked) > time.Hour {

if s.Version != global.Version {
console.Debugf("Resetting update message because Cog has been upgraded")
if err := writeState(&state{Message: "", LastChecked: time.Now(), Version: global.Version}); err != nil {
return err
}
}

if time.Since(s.LastChecked) > time.Hour {
startCheckingForRelease()
}
if state.Message != "" {
console.Info(state.Message)
if s.Message != "" {
console.Info(s.Message)
console.Info("")
}
return nil
Expand All @@ -50,7 +58,7 @@ func startCheckingForRelease() {
if r == nil {
break
}
if err := writeState(&state{Message: r.Message, LastChecked: time.Now()}); err != nil {
if err := writeState(&state{Message: r.Message, LastChecked: time.Now(), Version: global.Version}); err != nil {
console.Debugf("Failed to write state: %s", err)
}

Expand Down