repo-tools/brunel
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify Workers

Browse Source
This commit is contained in:
ferreo 2024-07-30 01:30:26 +01:00
parent 8f7657cf38
commit fd9e9418b2
2 changed files with 39 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
buildqueue/worker.go
View File

@ -82,15 +82,7 @@ func StartPackageQueueWorker(ctx context.Context) {
}() }()
} }
func StartQueueWorker(ctx context.Context) { func processQueueAndStatus(ctx context.Context) {
go processQueue(ctx)
}
func StartStatusWorker(ctx context.Context) {
go processStatus(ctx)
}
func processStatus(ctx context.Context) {
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -98,74 +90,59 @@ func processStatus(ctx context.Context) {
default: default:
q := GetQueue() q := GetQueue()
itemsToRemove := make([]string, 0) itemsToRemove := make([]string, 0)
buildingFound := false
q.ForEach(func(k string, item domain.BuildQueueItem) bool { q.ForEach(func(k string, item domain.BuildQueueItem) bool {
if item.Status != domain.Building { if item.Status == domain.Building {
return true buildingFound = true
} complete, err := CheckIfBuildComplete(ctx, item)
complete, err := CheckIfBuildComplete(ctx, item) if err != nil && !complete {
if err != nil && !complete { slog.Error("unable to check if build is complete: " + err.Error())
slog.Error("unable to check if build is complete: " + err.Error()) }
} if complete {
if complete { if err != nil {
if err != nil { updatePackageStatus(&item, domain.Error, domain.Error)
item.Source.Packages.ForEach(func(k string, v domain.PackageInfo) bool { } else {
v.Status = domain.Error updatePackageStatus(&item, domain.Current, domain.Built)
v.LastBuildStatus = domain.Error }
item.Source.Packages.Set(k, v)
return true
})
packages.UpdateSourcePackage(item.Source) packages.UpdateSourcePackage(item.Source)
itemsToRemove = append(itemsToRemove, k) itemsToRemove = append(itemsToRemove, k)
return true
} }
item.Source.Packages.ForEach(func(k string, v domain.PackageInfo) bool {
v.Status = domain.Current
v.LastBuildStatus = domain.Built
v.Version = item.BuildVersion
v.NewVersion = ""
item.Source.Packages.Set(k, v)
return true
})
packages.UpdateSourcePackage(item.Source)
itemsToRemove = append(itemsToRemove, k)
return true
} }
return true return true
}) })
for _, item := range itemsToRemove { for _, item := range itemsToRemove {
Remove(item) Remove(item)
} }
if !buildingFound {
err := ProcessNext()
if err != nil {
slog.Error("unable to process queue: " + err.Error())
}
}
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
} }
} }
} }
func processQueue(ctx context.Context) { func updatePackageStatus(item *domain.BuildQueueItem, status domain.PackageStatus, buildStatus domain.PackageStatus) {
for { item.Source.Packages.ForEach(func(k string, v domain.PackageInfo) bool {
select { v.Status = status
case <-ctx.Done(): v.LastBuildStatus = domain.PackageStatus(buildStatus)
return if status == domain.Current {
default: v.Version = item.BuildVersion
q := GetQueue() v.NewVersion = ""
buildingFound := false
q.ForEach(func(k string, item domain.BuildQueueItem) bool {
if item.Status == domain.Building {
buildingFound = true
return false
}
return true
})
if buildingFound {
time.Sleep(30 * time.Second)
continue
}
err := ProcessNext()
if err != nil {
slog.Error("unable to process queue: " + err.Error())
}
} }
time.Sleep(30 * time.Second) item.Source.Packages.Set(k, v)
} return true
})
}
func StartQueueAndStatusWorker(ctx context.Context) {
go processQueueAndStatus(ctx)
} }
func CheckIfBuildComplete(ctx context.Context, item domain.BuildQueueItem) (bool, error) { func CheckIfBuildComplete(ctx context.Context, item domain.BuildQueueItem) (bool, error) {

3
server.go
View File

@ -65,8 +65,7 @@ func runServer(ctx context.Context) error {
slog.Info("packages loaded in " + time.Since(start).String()) slog.Info("packages loaded in " + time.Since(start).String())
buildqueue.StartPackageQueueWorker(ctx) buildqueue.StartPackageQueueWorker(ctx)
buildqueue.StartQueueWorker(ctx) buildqueue.StartQueueAndStatusWorker(ctx)
buildqueue.StartStatusWorker(ctx)
cfg := fiber.Config{ cfg := fiber.Config{
JSONEncoder: json.Marshal, JSONEncoder: json.Marshal,