diff --git a/main.go b/main.go index 34d28d2..429d4c3 100644 --- a/main.go +++ b/main.go @@ -640,6 +640,7 @@ func (b *BuildManager) htmlWorker() { BuildDate string BuildDuration time.Duration Checked string + Log string } type Repo struct { @@ -653,7 +654,8 @@ func (b *BuildManager) htmlWorker() { } type tpl struct { - March []March + March []March + Generated time.Time } for { @@ -699,6 +701,10 @@ func (b *BuildManager) htmlWorker() { addPkg.Checked = pkg.Updated.UTC().Format(time.RFC3339) } + if pkg.Status == FAILED { + addPkg.Log = fmt.Sprintf("logs/%s.log", pkg.Pkgbase) + } + addRepo.Packages = append(addRepo.Packages, addPkg) } addMarch.Repos = append(addMarch.Repos, addRepo) @@ -706,6 +712,8 @@ func (b *BuildManager) htmlWorker() { gen.March = append(gen.March, addMarch) } + gen.Generated = time.Now().UTC() + statusTpl, err := template.ParseFiles("tpl/status.html") check(err) @@ -899,6 +907,9 @@ func main() { log.Warningf("Failed to drop priority: %v", err) } + err = os.MkdirAll(conf.Basedir.Repo, os.ModePerm) + check(err) + db, err = ent.Open("sqlite3", "file:"+conf.Basedir.Db+"?_fk=1&cache=shared") if err != nil { log.Panicf("Failed to open database %s: %v", conf.Basedir.Db, err) @@ -911,9 +922,6 @@ func main() { log.Panicf("Automigrate failed: %v", err) } - err = os.MkdirAll(conf.Basedir.Repo, os.ModePerm) - check(err) - buildManager = BuildManager{ build: make(chan *BuildPackage, 10000), parse: make(chan *BuildPackage, 10000), diff --git a/tpl/status.html b/tpl/status.html index a3eb64c..04658ca 100644 --- a/tpl/status.html +++ b/tpl/status.html @@ -13,6 +13,12 @@ + +
{{range $march := .March}}

{{$march.Name}}

@@ -26,7 +32,8 @@ {{$repo.Name}}-{{$march.Name}} -
@@ -48,9 +55,11 @@ - + {{end}} @@ -63,6 +72,12 @@ {{end}} +
+
+ Generated: {{.Generated}} +
+
+
{{$pkg.Skip}} {{$pkg.Svn2GitVersion}} {{$pkg.Version}} + {{with $pkg.Log}}{{end}} + -