From c3b12f10f9a6a0dc9f8e188221d709d5c0f00a1c Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 18 Nov 2021 13:46:56 +0100 Subject: [PATCH] fixed negative buildtime on currently building packages --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index eb60120..6687a99 100644 --- a/main.go +++ b/main.go @@ -57,12 +57,12 @@ func (b *BuildManager) buildWorker(id int) { b.buildWG.Add(1) } - start := time.Now() + start := time.Now().UTC() log.Infof("[%s/%s] Build starting", pkg.FullRepo, pkg.Pkgbase) 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) 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.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 b.repoPurge[pkg.FullRepo] <- pkg @@ -354,7 +354,7 @@ func (b *BuildManager) htmlWorker() { 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) }