mirror of
https://github.com/knadh/listmonk.git
synced 2024-09-20 15:26:33 +08:00
Fix update check looping on failed HTTP requests.
This commit is contained in:
parent
862d4240c5
commit
e4a7d307b3
|
@ -40,33 +40,29 @@ func checkUpdates(curVersion string, interval time.Duration, app *App) {
|
||||||
// Strip -* suffix.
|
// Strip -* suffix.
|
||||||
curVersion = reSemver.ReplaceAllString(curVersion, "")
|
curVersion = reSemver.ReplaceAllString(curVersion, "")
|
||||||
|
|
||||||
// Give a 15 minute buffer after app start in case the admin wants to disable
|
fnCheck := func() {
|
||||||
// update checks entirely and not make a request to upstream.
|
|
||||||
time.Sleep(time.Minute * 1)
|
|
||||||
|
|
||||||
for {
|
|
||||||
resp, err := http.Get(updateCheckURL)
|
resp, err := http.Get(updateCheckURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.log.Printf("error checking for remote update: %v", err)
|
app.log.Printf("error checking for remote update: %v", err)
|
||||||
continue
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if resp.StatusCode != 200 {
|
if resp.StatusCode != 200 {
|
||||||
app.log.Printf("non 200 response on remote update check: %d", resp.StatusCode)
|
app.log.Printf("non 200 response on remote update check: %d", resp.StatusCode)
|
||||||
continue
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := io.ReadAll(resp.Body)
|
b, err := io.ReadAll(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.log.Printf("error reading remote update payload: %v", err)
|
app.log.Printf("error reading remote update payload: %v", err)
|
||||||
continue
|
return
|
||||||
}
|
}
|
||||||
resp.Body.Close()
|
resp.Body.Close()
|
||||||
|
|
||||||
var out AppUpdate
|
var out AppUpdate
|
||||||
if err := json.Unmarshal(b, &out); err != nil {
|
if err := json.Unmarshal(b, &out); err != nil {
|
||||||
app.log.Printf("error unmarshalling remote update payload: %v", err)
|
app.log.Printf("error unmarshalling remote update payload: %v", err)
|
||||||
continue
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is an update. Set it on the global app state.
|
// There is an update. Set it on the global app state.
|
||||||
|
@ -81,7 +77,18 @@ func checkUpdates(curVersion string, interval time.Duration, app *App) {
|
||||||
app.Lock()
|
app.Lock()
|
||||||
app.update = &out
|
app.update = &out
|
||||||
app.Unlock()
|
app.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
time.Sleep(interval)
|
// Give a 15 minute buffer after app start in case the admin wants to disable
|
||||||
|
// update checks entirely and not make a request to upstream.
|
||||||
|
time.Sleep(time.Minute * 15)
|
||||||
|
fnCheck()
|
||||||
|
|
||||||
|
// Thereafter, check every $interval.
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
for range ticker.C {
|
||||||
|
fnCheck()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue