This commit is contained in:
parent
77d7a8624c
commit
b03e85db0b
7 changed files with 77 additions and 2 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE workers
|
||||||
|
DROP IF EXISTS queue_enable;
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE workers
|
||||||
|
ADD queue_enable boolean NOT NULL DEFAULT false;
|
|
@ -16,8 +16,10 @@ type IndexData struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type IndexWorker struct {
|
type IndexWorker struct {
|
||||||
|
ID string
|
||||||
Worker
|
Worker
|
||||||
Status *types.WorkerStatus
|
Status *types.WorkerStatus
|
||||||
|
QueueEnable bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleIndex(w http.ResponseWriter, r *http.Request) {
|
func handleIndex(w http.ResponseWriter, r *http.Request) {
|
||||||
|
@ -39,11 +41,13 @@ func handleIndex(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
slog.InfoContext(r.Context(), "Got Worker Status", "id", i, "status", status)
|
slog.InfoContext(r.Context(), "Got Worker Status", "id", i, "status", status)
|
||||||
data.Workers = append(data.Workers, IndexWorker{
|
data.Workers = append(data.Workers, IndexWorker{
|
||||||
|
ID: i,
|
||||||
Worker: *Workers[i],
|
Worker: *Workers[i],
|
||||||
Status: &status,
|
Status: &status,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
data.Workers = append(data.Workers, IndexWorker{
|
data.Workers = append(data.Workers, IndexWorker{
|
||||||
|
ID: i,
|
||||||
Worker: *Workers[i],
|
Worker: *Workers[i],
|
||||||
Status: nil,
|
Status: nil,
|
||||||
})
|
})
|
||||||
|
|
40
server/queue.go
Normal file
40
server/queue.go
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func HandleSetQueueEnable(w http.ResponseWriter, r *http.Request) {
|
||||||
|
err := r.ParseForm()
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, fmt.Sprintf("Parseing Form: %v", err), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
enable := r.FormValue("enable")
|
||||||
|
if enable != "true" && enable != "false" {
|
||||||
|
http.Error(w, "Enable must be true or false", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
worker := r.FormValue("worker")
|
||||||
|
|
||||||
|
slog.Info("Got set Queue Enable", "enable", enable, "worker", worker)
|
||||||
|
|
||||||
|
if worker == "all" {
|
||||||
|
_, err = db.Exec(r.Context(), "UPDATE workers SET queue_enable = $1", enable)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, fmt.Sprintf("Setting Worker Queue Enable: %v", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_, err = db.Exec(r.Context(), "UPDATE workers SET queue_enable = $1 where id = $2", enable, worker)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, fmt.Sprintf("Setting Worker Queue Enable: %v", err), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
http.Redirect(w, r, r.Header.Get("Referer"), http.StatusFound)
|
||||||
|
}
|
|
@ -101,6 +101,7 @@ func Start(_conf config.Config, tmplFS embed.FS, staticFS embed.FS, migrationsFS
|
||||||
mux.HandleFunc("/libraries/{id}", handleLibrary)
|
mux.HandleFunc("/libraries/{id}", handleLibrary)
|
||||||
mux.HandleFunc("/libraries", handleLibraries)
|
mux.HandleFunc("/libraries", handleLibraries)
|
||||||
mux.HandleFunc("/ffmpeg_commands", handleFfmpegCommands)
|
mux.HandleFunc("/ffmpeg_commands", handleFfmpegCommands)
|
||||||
|
mux.HandleFunc("/queue_enable", HandleSetQueueEnable)
|
||||||
|
|
||||||
mux.HandleFunc("/", handleIndex)
|
mux.HandleFunc("/", handleIndex)
|
||||||
|
|
||||||
|
|
|
@ -371,8 +371,18 @@ func assignQueuedTasks(ctx context.Context) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if Workers[i].Connected {
|
if Workers[i].Connected {
|
||||||
|
var queueEnable bool
|
||||||
|
err := db.QueryRow(ctx, "SELECT queue_enable FROM workers WHERE id = $1", i).Scan(&queueEnable)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Error Querying Worker Queue Enable: %w", err)
|
||||||
|
}
|
||||||
|
if !queueEnable {
|
||||||
|
slog.DebugContext(ctx, "Skipping Worker since Queueing is disabled", "worker_id", i)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
var count int
|
var count int
|
||||||
err := db.QueryRow(ctx, "SELECT COUNT(*) FROM tasks WHERE worker_id = $1 AND (status = $2 OR status = $3 OR status = $4 OR status = $5)", i, constants.TASK_STATUS_UNKNOWN, constants.TASK_STATUS_ASSIGNED, constants.TASK_STATUS_RUNNING, constants.TASK_STATUS_WAITING).Scan(&count)
|
err = db.QueryRow(ctx, "SELECT COUNT(*) FROM tasks WHERE worker_id = $1 AND (status = $2 OR status = $3 OR status = $4 OR status = $5)", i, constants.TASK_STATUS_UNKNOWN, constants.TASK_STATUS_ASSIGNED, constants.TASK_STATUS_RUNNING, constants.TASK_STATUS_WAITING).Scan(&count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error Querying Worker Task Count: %w", err)
|
return fmt.Errorf("Error Querying Worker Task Count: %w", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,22 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
<h2>Set Queue Enable</h2>
|
||||||
|
<form method="POST" action= "/queue_enable">
|
||||||
|
<label for="worker">Worker:</label>
|
||||||
|
<select id="worker" name="worker">
|
||||||
|
<option value="all">All</option>
|
||||||
|
{{range $w := .Workers}}
|
||||||
|
<option value="{{$w.ID}}">{{$w.Name}}</option>
|
||||||
|
{{end}}
|
||||||
|
</select>
|
||||||
|
<label for="enable">Enable</label>
|
||||||
|
<select id="enable" name="enable">
|
||||||
|
<option value="true">True</option>
|
||||||
|
<option value="false">False</option>
|
||||||
|
</select>
|
||||||
|
<input type="submit" value="Submit">
|
||||||
|
</form>
|
||||||
<h2>Workers</h2>
|
<h2>Workers</h2>
|
||||||
<div class="workers">
|
<div class="workers">
|
||||||
{{range $w := .Workers}}
|
{{range $w := .Workers}}
|
||||||
|
|
Loading…
Add table
Reference in a new issue