SunRed/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed negative buildtime on currently building packages

Browse Source
This commit is contained in:
Giovanni Harting
2021-11-18 13:46:56 +01:00
parent 8467b17ffc
commit c3b12f10f9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@@ -57,12 +57,12 @@ func (b *BuildManager) buildWorker(id int) {
b.buildWG.Add(1) b.buildWG.Add(1)
} }
start := time.Now() start := time.Now().UTC()
log.Infof("[%s/%s] Build starting", pkg.FullRepo, pkg.Pkgbase) log.Infof("[%s/%s] Build starting", pkg.FullRepo, pkg.Pkgbase)
dbPkg := getDbPackage(pkg) dbPkg := getDbPackage(pkg)
dbPkg = dbPkg.Update().SetStatus(dbpackage.StatusBuilding).SetBuildTimeStart(time.Now().UTC()).ClearSkipReason().SaveX(context.Background()) dbPkg = dbPkg.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(context.Background())
err := importKeys(pkg) err := importKeys(pkg)
if err != nil { if err != nil {
@@ -121,7 +121,7 @@ func (b *BuildManager) buildWorker(id int) {
check(os.MkdirAll(filepath.Join(conf.Basedir.Repo, "logs"), 0755)) check(os.MkdirAll(filepath.Join(conf.Basedir.Repo, "logs"), 0755))
check(os.WriteFile(filepath.Join(conf.Basedir.Repo, "logs", pkg.Pkgbase+".log"), out.Bytes(), 0644)) check(os.WriteFile(filepath.Join(conf.Basedir.Repo, "logs", pkg.Pkgbase+".log"), out.Bytes(), 0644))
dbPkg.Update().SetStatus(dbpackage.StatusFailed).ClearSkipReason().SetBuildTimeEnd(time.Now()).SetHash(pkg.Hash).ExecX(context.Background()) dbPkg.Update().SetStatus(dbpackage.StatusFailed).ClearSkipReason().SetBuildTimeStart(start).SetBuildTimeEnd(time.Now().UTC()).SetHash(pkg.Hash).ExecX(context.Background())
// purge failed package from repo // purge failed package from repo
b.repoPurge[pkg.FullRepo] <- pkg b.repoPurge[pkg.FullRepo] <- pkg
@@ -354,7 +354,7 @@ func (b *BuildManager) htmlWorker() {
Svn2GitVersion: pkg.Version, Svn2GitVersion: pkg.Version,
} }
if !pkg.BuildTimeEnd.IsZero() && !pkg.BuildTimeStart.IsZero() { if !pkg.BuildTimeEnd.IsZero() && !pkg.BuildTimeStart.IsZero() && pkg.BuildTimeStart.Before(pkg.BuildTimeEnd) {
addPkg.BuildDuration = pkg.BuildTimeEnd.Sub(pkg.BuildTimeStart) addPkg.BuildDuration = pkg.BuildTimeEnd.Sub(pkg.BuildTimeStart)
} }