fixed packages with no peak mem available

This commit is contained in:
2023-12-14 17:36:54 +01:00
parent 5bbf0add35
commit 53e8790bb8

22
api.go
View File

@@ -11,6 +11,7 @@ import (
"somegit.dev/ALHP/ALHP.GO/ent/dbpackage" "somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
"somegit.dev/ALHP/ALHP.GO/ent/predicate" "somegit.dev/ALHP/ALHP.GO/ent/predicate"
"strconv" "strconv"
"time"
) )
type StatsResponse struct { type StatsResponse struct {
@@ -34,8 +35,8 @@ type ThinPackage struct {
DebugSymbols dbpackage.DebugSymbols `json:"debug_symbols"` DebugSymbols dbpackage.DebugSymbols `json:"debug_symbols"`
ArchVersion string `json:"arch_version"` ArchVersion string `json:"arch_version"`
RepoVersion string `json:"repo_version"` RepoVersion string `json:"repo_version"`
BuildDate int64 `json:"build_date"` BuildDate string `json:"build_date"`
PeakMem string `json:"peak_mem"` PeakMem *string `json:"peak_mem"`
} }
type PackageResponse struct { type PackageResponse struct {
@@ -142,7 +143,7 @@ func GetPackages(w http.ResponseWriter, r *http.Request) {
resp := new(PackageResponse) resp := new(PackageResponse)
for _, mPkg := range rPackages { for _, mPkg := range rPackages {
resp.Packages = append(resp.Packages, &ThinPackage{ nPkg := &ThinPackage{
Pkgbase: mPkg.Pkgbase, Pkgbase: mPkg.Pkgbase,
SplitPackages: mPkg.Packages, SplitPackages: mPkg.Packages,
Status: mPkg.Status, Status: mPkg.Status,
@@ -151,9 +152,18 @@ func GetPackages(w http.ResponseWriter, r *http.Request) {
DebugSymbols: mPkg.DebugSymbols, DebugSymbols: mPkg.DebugSymbols,
ArchVersion: mPkg.Version, ArchVersion: mPkg.Version,
RepoVersion: mPkg.RepoVersion, RepoVersion: mPkg.RepoVersion,
BuildDate: mPkg.BuildTimeStart.Unix(), }
PeakMem: (datasize.ByteSize(*mPkg.MaxRss) * datasize.KB).HumanReadable(),
}) if !mPkg.BuildTimeStart.IsZero() {
nPkg.BuildDate = mPkg.BuildTimeStart.UTC().Format(time.RFC1123)
}
if mPkg.MaxRss != nil {
hrSize := (datasize.ByteSize(*mPkg.MaxRss) * datasize.KB).HumanReadable()
nPkg.PeakMem = &hrSize
}
resp.Packages = append(resp.Packages, nPkg)
} }
resp.Page = page resp.Page = page
resp.Limit = limit resp.Limit = limit