Fixes 2537: status now prints 'failed to check latest version' when the checkpoint API is not available (+test).
This commit is contained in:
1 parent
9414e2979d
commit
b03b3fccc7
3 files changed
+48
-4
No files matched your search
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
var checker *checkpoint.Checker
|
||||
var newVersion atomic.Value
|
||||
var success atomic.Value
|
||||
|
||||
const (
|
||||
updateCheckPeriod = 6 * time.Hour
|
||||
@@ -17,9 +18,11 @@ const (
|
||||
|
||||
func checkForUpdates(dockerVersion string, network string) {
|
||||
newVersion.Store("")
|
||||
success.Store(true)
|
||||
|
||||
handleResponse := func(r *checkpoint.CheckResponse, err error) {
|
||||
if err != nil {
|
||||
success.Store(false)
|
||||
Log.Printf("Error checking version: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
+6
-4
@@ -240,6 +240,7 @@ var ipamTemplate = defTemplate("ipamTemplate", `{{printIPAMRanges .Router .IPAM}
|
||||
|
||||
type VersionCheck struct {
|
||||
Enabled bool
|
||||
Success bool
|
||||
NewVersion string
|
||||
NextCheckAt time.Time
|
||||
}
|
||||
@@ -251,6 +252,7 @@ func versionCheck() *VersionCheck {
|
||||
}
|
||||
|
||||
v.Enabled = true
|
||||
v.Success = success.Load().(bool)
|
||||
v.NewVersion = newVersion.Load().(string)
|
||||
v.NextCheckAt = checker.NextCheckAt()
|
||||
|
||||
@@ -261,12 +263,12 @@ func (v *VersionCheck) String() string {
|
||||
switch {
|
||||
case !v.Enabled:
|
||||
return "version check update disabled"
|
||||
case !v.Success:
|
||||
return fmt.Sprintf("failed to check latest version - see logs; next check at %s", v.NextCheckAt.Format("2006/01/02 15:04:05"))
|
||||
case v.NewVersion != "":
|
||||
return fmt.Sprintf("version %s available - please upgrade!",
|
||||
v.NewVersion)
|
||||
return fmt.Sprintf("version %s available - please upgrade!", v.NewVersion)
|
||||
default:
|
||||
return fmt.Sprintf("up to date; next check at %s",
|
||||
v.NextCheckAt.Format("2006/01/02 15:04:05"))
|
||||
return fmt.Sprintf("up to date; next check at %s", v.NextCheckAt.Format("2006/01/02 15:04:05"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user