ALHP/ALHP.GO
6
42
Fork 9
Code Issues 25 Pull Requests Projects Releases Wiki Activity

minor code cleanup

Browse Source
This commit is contained in:
Giovanni Harting
2024-12-15 01:03:26 +01:00
parent 286134674b
commit 9695d146c5
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.golangci.yaml
View File

@@ -14,7 +14,7 @@ linters-settings:
disabled-checks: disabled-checks:
- whyNoLint - whyNoLint
- filepathJoin - filepathJoin
gomnd: mnd:
checks: checks:
- argument - argument
- case - case
@@ -91,3 +91,4 @@ linters:
- errname - errname
- goerr113 - goerr113
- depguard - depguard
- noctx

10
buildmanager.go
View File

@@ -74,9 +74,9 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
} }
// check if package can be built with current memory limit // check if package can be built with current memory limit
if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit { if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit { //nolint:gosec
log.Warningf("[Q] %s->%s exeeds memory limit: %s->%s", pkg.FullRepo, pkg.Pkgbase, log.Warningf("[Q] %s->%s exeeds memory limit: %s->%s", pkg.FullRepo, pkg.Pkgbase,
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit) datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit) //nolint:gosec
doneQLock.Lock() doneQLock.Lock()
doneQ = append(doneQ, pkg) doneQ = append(doneQ, pkg)
doneQLock.Unlock() doneQLock.Unlock()
@@ -88,9 +88,9 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
b.buildingLock.RUnlock() b.buildingLock.RUnlock()
// check if package can be build right now // check if package can be build right now
if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit { if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit { //nolint:gosec
log.Debugf("[Q] skipped package with max_rss %s while load %s: %s->%s", log.Debugf("[Q] skipped package with max_rss %s while load %s: %s->%s",
datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March) datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March) //nolint:gosec
continue continue
} }
} else { } else {
@@ -438,7 +438,7 @@ func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
continue continue
} }
// try download srcinfo from repo // try download .SRCINFO from repo
srcInfo, err := downloadSRCINFO(pkg.DBPackage.Pkgbase, state.TagRev) srcInfo, err := downloadSRCINFO(pkg.DBPackage.Pkgbase, state.TagRev)
if err == nil { if err == nil {
pkg.Srcinfo = srcInfo pkg.Srcinfo = srcInfo

4
proto_package.go
View File

@@ -60,8 +60,8 @@ func (p *ProtoPackage) isEligible(ctx context.Context) bool {
p.DBPackage.SkipReason = "blacklisted" p.DBPackage.SkipReason = "blacklisted"
p.DBPackage.Status = dbpackage.StatusSkipped p.DBPackage.Status = dbpackage.StatusSkipped
skipping = true skipping = true
case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit: case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit: //nolint:gosec
log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB) log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB) //nolint:gosec
p.DBPackage.SkipReason = "memory limit exceeded" p.DBPackage.SkipReason = "memory limit exceeded"
p.DBPackage.Status = dbpackage.StatusSkipped p.DBPackage.Status = dbpackage.StatusSkipped
skipping = true skipping = true

8
utils.go
View File

@@ -140,7 +140,7 @@ func pkgList2MaxMem(pkgList []*ProtoPackage) datasize.ByteSize {
var sum uint64 var sum uint64
for _, pkg := range pkgList { for _, pkg := range pkgList {
if pkg.DBPackage.MaxRss != nil { if pkg.DBPackage.MaxRss != nil {
sum += uint64(*pkg.DBPackage.MaxRss) sum += uint64(*pkg.DBPackage.MaxRss) //nolint:gosec
} }
} }
@@ -701,8 +701,10 @@ func Copy(srcPath, dstPath string) (err error) {
return err return err
} }
func downloadSRCINFO(pkg string, tag string) (*srcinfo.Srcinfo, error) { func downloadSRCINFO(pkg, tag string) (*srcinfo.Srcinfo, error) {
resp, err := http.Get(fmt.Sprintf("https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag)) resp, err := http.Get(fmt.Sprintf(
"https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag),
)
if err != nil { if err != nil {
return nil, err return nil, err
} }