rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

frontend: Make Control Server nicer

Browse source
This commit is contained in:
Tom Wiesing 2022-10-16 15:27:35 +02:00
parent c258b46443
commit 36891d7e7c
No known key found for this signature in database
16 changed files with 231 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/component/instances/wisski_info.go
View file

@ -1,6 +1,7 @@
package instances
import (
"log"
"time"
"github.com/FAU-CDI/wisski-distillery/internal/models"
@ -22,6 +23,7 @@ type WissKIInfo struct {
Running bool
LastRebuild time.Time
LastUpdate time.Time
LastCron time.Time
// List of backups made
Snapshots []models.Export
@ -40,9 +42,9 @@ func (wisski *WissKI) Info(quick bool) (info WissKIInfo, err error) {
if !quick {
server, err := wisski.NewPHPServer()
if err == nil {
wisski.infoSlow(&info, server, &group)
defer server.Close()
}
wisski.infoSlow(&info, server, &group)
}
err = group.Wait()
@ -87,19 +89,28 @@ func (wisski *WissKI) infoQuick(info *WissKIInfo, group *errgroup.Group) {
func (wisski *WissKI) infoSlow(info *WissKIInfo, server *PHPServer, group *errgroup.Group) {
group.Go(func() (err error) {
info.Prefixes, _ = wisski.Prefixes(server)
info.Prefixes, err = wisski.Prefixes(server)
log.Println("error prefixes: ", err)
return nil
})
group.Go(func() error {
info.Snapshots, _ = wisski.Snapshots()
group.Go(func() (err error) {
info.Snapshots, err = wisski.Snapshots()
log.Println("error snapshots: ", err)
return nil
})
group.Go(func() error {
info.Pathbuilders, _ = wisski.AllPathbuilders(server)
group.Go(func() (err error) {
info.Pathbuilders, err = wisski.AllPathbuilders(server)
log.Println("error pathbuilders: ", err)
return nil
})
group.Go(func() (err error) {
info.LastCron, err = wisski.LastCron(server)
log.Println("error cron: ", err)
return
})
}
// Running checks if this WissKI is currently running.