mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-22 16:36:30 +00:00
Pause/Resume queue
This commit is contained in:
parent
8f8276f219
commit
d39dd6f2ff
5 changed files with 50 additions and 1 deletions
|
@ -31,6 +31,7 @@ type fifo struct {
|
|||
running map[string]*entry
|
||||
pending *list.List
|
||||
extension time.Duration
|
||||
paused bool
|
||||
}
|
||||
|
||||
// New returns a new fifo queue.
|
||||
|
@ -40,6 +41,7 @@ func New() Queue {
|
|||
running: map[string]*entry{},
|
||||
pending: list.New(),
|
||||
extension: time.Minute * 10,
|
||||
paused: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -167,14 +169,32 @@ func (q *fifo) Info(c context.Context) InfoT {
|
|||
for _, entry := range q.running {
|
||||
stats.Running = append(stats.Running, entry.item)
|
||||
}
|
||||
stats.Paused = q.paused
|
||||
|
||||
q.Unlock()
|
||||
return stats
|
||||
}
|
||||
|
||||
func (q *fifo) Pause() {
|
||||
q.Lock()
|
||||
q.paused = true
|
||||
q.Unlock()
|
||||
}
|
||||
|
||||
func (q *fifo) Resume() {
|
||||
q.Lock()
|
||||
q.paused = false
|
||||
q.Unlock()
|
||||
go q.process()
|
||||
}
|
||||
|
||||
// helper function that loops through the queue and attempts to
|
||||
// match the item to a single subscriber.
|
||||
func (q *fifo) process() {
|
||||
if q.paused {
|
||||
return
|
||||
}
|
||||
|
||||
defer func() {
|
||||
// the risk of panic is low. This code can probably be removed
|
||||
// once the code has been used in real world installs without issue.
|
||||
|
|
|
@ -93,6 +93,7 @@ type InfoT struct {
|
|||
Running int `json:"running_count"`
|
||||
Complete int `json:"completed_count"`
|
||||
} `json:"stats"`
|
||||
Paused bool
|
||||
}
|
||||
|
||||
// Filter filters tasks in the queue. If the Filter returns false,
|
||||
|
@ -128,4 +129,10 @@ type Queue interface {
|
|||
|
||||
// Info returns internal queue information.
|
||||
Info(c context.Context) InfoT
|
||||
|
||||
// Stops the queue from handing out new work items in Poll
|
||||
Pause()
|
||||
|
||||
// Starts the queue again, Poll returns new items
|
||||
Resume()
|
||||
}
|
||||
|
|
|
@ -148,6 +148,18 @@ func Load(mux *httptreemux.ContextMux, middleware ...gin.HandlerFunc) http.Handl
|
|||
)
|
||||
}
|
||||
|
||||
queue := e.Group("/api/queue")
|
||||
{
|
||||
queue.GET("/pause",
|
||||
session.MustAdmin(),
|
||||
server.PauseQueue,
|
||||
)
|
||||
queue.GET("/resume",
|
||||
session.MustAdmin(),
|
||||
server.ResumeQueue,
|
||||
)
|
||||
}
|
||||
|
||||
auth := e.Group("/authorize")
|
||||
{
|
||||
auth.GET("", server.HandleAuth)
|
||||
|
|
|
@ -20,6 +20,7 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"net/http"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"time"
|
||||
|
@ -51,6 +52,16 @@ func GetQueueInfo(c *gin.Context) {
|
|||
)
|
||||
}
|
||||
|
||||
func PauseQueue(c *gin.Context) {
|
||||
Config.Services.Queue.Pause()
|
||||
c.Status(http.StatusOK)
|
||||
}
|
||||
|
||||
func ResumeQueue(c *gin.Context) {
|
||||
Config.Services.Queue.Resume()
|
||||
c.Status(http.StatusOK)
|
||||
}
|
||||
|
||||
func PostHook(c *gin.Context) {
|
||||
remote_ := remote.FromContext(c)
|
||||
|
||||
|
|
|
@ -77,7 +77,6 @@ func EventStreamSSE(c *gin.Context) {
|
|||
}()
|
||||
|
||||
go func() {
|
||||
// TODO remove this from global config
|
||||
Config.Services.Pubsub.Subscribe(ctx, "topic/events", func(m pubsub.Message) {
|
||||
defer func() {
|
||||
recover() // fix #2480
|
||||
|
|
Loading…
Reference in a new issue