starred/ollama-ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-17 15:53:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

app: fix first update check delayed by 1 hour (#14427)

Browse Source
This commit is contained in:
Eva H
2026-02-25 18:29:55 -05:00
committed by GitHub
parent 0f23b7bff5
commit 9bf41969f0
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/cmd/app/app.go
View File

@@ -35,6 +35,7 @@ import (
var ( var (
wv = &Webview{} wv = &Webview{}
uiServerPort int uiServerPort int
appStore *store.Store
) )
var debug = strings.EqualFold(os.Getenv("OLLAMA_DEBUG"), "true") || os.Getenv("OLLAMA_DEBUG") == "1" var debug = strings.EqualFold(os.Getenv("OLLAMA_DEBUG"), "true") || os.Getenv("OLLAMA_DEBUG") == "1"
@@ -208,6 +209,7 @@ func main() {
uiServerPort = port uiServerPort = port
st := &store.Store{} st := &store.Store{}
appStore = st
// Enable CORS in development mode // Enable CORS in development mode
if devMode { if devMode {
@@ -360,8 +362,7 @@ func startHiddenTasks() {
slog.Info("deferring pending update for fast startup") slog.Info("deferring pending update for fast startup")
} else { } else {
// Check if auto-update is enabled before automatically upgrading // Check if auto-update is enabled before automatically upgrading
st := &store.Store{} settings, err := appStore.Settings()
settings, err := st.Settings()
if err != nil { if err != nil {
slog.Warn("failed to load settings for upgrade check", "error", err) slog.Warn("failed to load settings for upgrade check", "error", err)
} else if !settings.AutoUpdateEnabled { } else if !settings.AutoUpdateEnabled {

3
app/updater/updater.go
View File

@@ -289,6 +289,7 @@ func (u *Updater) TriggerImmediateCheck() {
func (u *Updater) StartBackgroundUpdaterChecker(ctx context.Context, cb func(string) error) { func (u *Updater) StartBackgroundUpdaterChecker(ctx context.Context, cb func(string) error) {
u.checkNow = make(chan struct{}, 1) u.checkNow = make(chan struct{}, 1)
u.checkNow <- struct{}{} // Trigger first check after initial delay
go func() { go func() {
// Don't blast an update message immediately after startup // Don't blast an update message immediately after startup
time.Sleep(UpdateCheckInitialDelay) time.Sleep(UpdateCheckInitialDelay)
@@ -333,7 +334,7 @@ func (u *Updater) StartBackgroundUpdaterChecker(ctx context.Context, cb func(str
continue continue
} }
// Download successful - show tray notification (regardless of toggle state) // Download successful - show tray notification
err = cb(resp.UpdateVersion) err = cb(resp.UpdateVersion)
if err != nil { if err != nil {
slog.Warn("failed to register update available with tray", "error", err) slog.Warn("failed to register update available with tray", "error", err)

9
app/updater/updater_test.go
View File

@@ -351,10 +351,13 @@ func TestTriggerImmediateCheck(t *testing.T) {
updater.StartBackgroundUpdaterChecker(ctx, cb) updater.StartBackgroundUpdaterChecker(ctx, cb)
// Wait for goroutine to start and pass initial delay // Wait for the initial check that fires after the initial delay
time.Sleep(10 * time.Millisecond) select {
case <-checkDone:
case <-time.After(2 * time.Second):
t.Fatal("initial check did not happen")
}
// With 1 hour interval, no check should have happened yet
initialCount := checkCount.Load() initialCount := checkCount.Load()
// Trigger immediate check // Trigger immediate check