neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add converter function for store.Process

Browse Source
This commit is contained in:
Ingo Oppermann 2023-07-12 14:35:29 +02:00
parent fe715adbce
commit 520683138d
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
2 changed files with 63 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
http/handler/api/cluster_process.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"strconv"
"strings"
clientapi "github.com/datarhei/core-client-go/v16/api"
@ -89,38 +90,7 @@ func (h *ClusterHandler) GetAllProcesses(c echo.Context) error {
continue
}
process := api.Process{
ID: p.Config.ID,
Owner: p.Config.Owner,
Domain: p.Config.Domain,
Type: "ffmpeg",
Reference: p.Config.Reference,
CreatedAt: p.CreatedAt.Unix(),
UpdatedAt: p.UpdatedAt.Unix(),
}
if filter.metadata {
process.Metadata = p.Metadata
}
if filter.config {
config := &api.ProcessConfig{}
config.Unmarshal(p.Config)
process.Config = config
}
if filter.state {
process.State = &api.ProcessState{
State: "failed",
Order: p.Order,
LastLog: p.Error,
}
}
if filter.report {
process.Report = &api.ProcessReport{}
}
process := h.convertStoreProcessToAPIProcess(p, filter)
missing = append(missing, process)
}
@ -255,6 +225,64 @@ func (h *ClusterHandler) getFilteredStoreProcesses(processes []store.Process, wa
return final
}
func (h *ClusterHandler) convertStoreProcessToAPIProcess(p store.Process, filter filter) api.Process {
process := api.Process{
ID: p.Config.ID,
Owner: p.Config.Owner,
Domain: p.Config.Domain,
Type: "ffmpeg",
Reference: p.Config.Reference,
CreatedAt: p.CreatedAt.Unix(),
UpdatedAt: p.UpdatedAt.Unix(),
}
if filter.metadata {
process.Metadata = p.Metadata
}
if filter.config {
config := &api.ProcessConfig{}
config.Unmarshal(p.Config)
process.Config = config
}
if filter.state {
process.State = &api.ProcessState{
Order: p.Order,
LastLog: p.Error,
}
if len(p.Error) != 0 {
process.State.State = "failed"
} else {
process.State.State = "finished"
}
}
if filter.report {
process.Report = &api.ProcessReport{
ProcessReportEntry: api.ProcessReportEntry{
CreatedAt: p.CreatedAt.Unix(),
Prelude: []string{},
Log: [][2]string{},
Matches: []string{},
},
}
if len(p.Error) != 0 {
process.Report.Prelude = []string{p.Error}
process.Report.Log = [][2]string{
{strconv.FormatInt(p.CreatedAt.Unix(), 10), p.Error},
}
process.Report.ExitedAt = p.CreatedAt.Unix()
process.Report.ExitState = "failed"
}
}
return process
}
// GetProcess returns the process with the given ID whereever it's running on the cluster
// @Summary List a process by its ID
// @Description List a process by its ID. Use the filter parameter to specifiy the level of detail of the output.
@ -292,38 +320,7 @@ func (h *ClusterHandler) GetProcess(c echo.Context) error {
return api.Err(http.StatusNotFound, "", "Unknown process ID: %s", id)
}
process := api.Process{
ID: p.Config.ID,
Owner: p.Config.Owner,
Domain: p.Config.Domain,
Type: "ffmpeg",
Reference: p.Config.Reference,
CreatedAt: p.CreatedAt.Unix(),
UpdatedAt: p.UpdatedAt.Unix(),
}
if filter.metadata {
process.Metadata = p.Metadata
}
if filter.config {
config := &api.ProcessConfig{}
config.Unmarshal(p.Config)
process.Config = config
}
if filter.state {
process.State = &api.ProcessState{
State: "failed",
Order: p.Order,
LastLog: p.Error,
}
}
if filter.report {
process.Report = &api.ProcessReport{}
}
process := h.convertStoreProcessToAPIProcess(p, filter)
return c.JSON(http.StatusOK, process)
}

44
http/handler/api/cluster_store.go
View File

@ -33,27 +33,7 @@ func (h *ClusterHandler) ListStoreProcesses(c echo.Context) error {
continue
}
process := api.Process{
ID: p.Config.ID,
Owner: p.Config.Owner,
Domain: p.Config.Domain,
Type: "ffmpeg",
Reference: p.Config.Reference,
CreatedAt: p.CreatedAt.Unix(),
UpdatedAt: p.UpdatedAt.Unix(),
Metadata: p.Metadata,
}
config := &api.ProcessConfig{}
config.Unmarshal(p.Config)
process.Config = config
process.State = &api.ProcessState{
State: "failed",
Order: p.Order,
LastLog: p.Error,
}
process := h.convertStoreProcessToAPIProcess(p, newFilter(""))
processes = append(processes, process)
}
@ -91,27 +71,7 @@ func (h *ClusterHandler) GetStoreProcess(c echo.Context) error {
return api.Err(http.StatusNotFound, "", "process not found: %s in domain '%s'", pid.ID, pid.Domain)
}
process := api.Process{
ID: p.Config.ID,
Owner: p.Config.Owner,
Domain: p.Config.Domain,
Type: "ffmpeg",
Reference: p.Config.Reference,
CreatedAt: p.CreatedAt.Unix(),
UpdatedAt: p.UpdatedAt.Unix(),
Metadata: p.Metadata,
}
config := &api.ProcessConfig{}
config.Unmarshal(p.Config)
process.Config = config
process.State = &api.ProcessState{
State: "failed",
Order: p.Order,
LastLog: p.Error,
}
process := h.convertStoreProcessToAPIProcess(p, newFilter(""))
return c.JSON(http.StatusOK, process)
}