Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-29 13:57:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2812 from reasonerjt/systeminfo-scan-all

Browse Source 
add next_scan_all to systeminfo api response
This commit is contained in:
Daniel Jiang 2017-07-19 15:49:57 +08:00 committed by GitHub
commit 8a23f0e0a1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/api/systeminfo.go
View File

@ -25,6 +25,7 @@ import (
"github.com/vmware/harbor/src/common/dao"
clairdao "github.com/vmware/harbor/src/common/dao/clair"
"github.com/vmware/harbor/src/common/models"
"github.com/vmware/harbor/src/common/utils"
"github.com/vmware/harbor/src/common/utils/clair"
"github.com/vmware/harbor/src/common/utils/log"
"github.com/vmware/harbor/src/ui/config"
@ -95,6 +96,7 @@ type GeneralInfo struct {
SelfRegistration bool `json:"self_registration"`
HasCARoot bool `json:"has_ca_root"`
HarborVersion string `json:"harbor_version"`
NextScanAll int64 `json:"next_scan_all"`
ClairVulnStatus *models.ClairVulnerabilityStatus `json:"clair_vulnerability_status,omitempty"`
}
@ -176,6 +178,11 @@ func (sia *SystemInfoAPI) GetGeneralInfo() {
}
if info.WithClair {
info.ClairVulnStatus = getClairVulnStatus()
t := utils.ScanAllMarker().Next().UTC().Unix()
if t < 0 {
t = 0
}
info.NextScanAll = t
}
sia.Data["json"] = info
sia.ServeJSON()