apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-05 16:07:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix API metadata endpoint responses

Browse Source
This commit is contained in:
Ingo Oppermann
2022-09-29 10:44:21 +02:00
parent 6288b620df
commit 54dd24a5c0
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
restream/restream.go
View File

@@ -30,28 +30,28 @@ import (
type Restreamer interface { type Restreamer interface {
ID() string // ID of this instance ID() string // ID of this instance
Name() string // Arbitrary name of this instance Name() string // Arbitrary name of this instance
CreatedAt() time.Time // time of when this instance has been created CreatedAt() time.Time // Time of when this instance has been created
Start() // start all processes that have a "start" order Start() // Start all processes that have a "start" order
Stop() // stop all running process but keep their "start" order Stop() // Stop all running process but keep their "start" order
AddProcess(config *app.Config) error // add a new process AddProcess(config *app.Config) error // Add a new process
GetProcessIDs(idpattern, refpattern string) []string // get a list of process IDs based on patterns for ID and reference GetProcessIDs(idpattern, refpattern string) []string // Get a list of process IDs based on patterns for ID and reference
DeleteProcess(id string) error // delete a process DeleteProcess(id string) error // Delete a process
UpdateProcess(id string, config *app.Config) error // update a process UpdateProcess(id string, config *app.Config) error // Update a process
StartProcess(id string) error // start a process StartProcess(id string) error // Start a process
StopProcess(id string) error // stop a process StopProcess(id string) error // Stop a process
RestartProcess(id string) error // restart a process RestartProcess(id string) error // Restart a process
ReloadProcess(id string) error // reload a process ReloadProcess(id string) error // Reload a process
GetProcess(id string) (*app.Process, error) // get a process GetProcess(id string) (*app.Process, error) // Get a process
GetProcessState(id string) (*app.State, error) // get the state of a process GetProcessState(id string) (*app.State, error) // Get the state of a process
GetProcessLog(id string) (*app.Log, error) // get the logs of a process GetProcessLog(id string) (*app.Log, error) // Get the logs of a process
GetPlayout(id, inputid string) (string, error) // get the URL of the playout API for a process GetPlayout(id, inputid string) (string, error) // Get the URL of the playout API for a process
Probe(id string) app.Probe // probe a process Probe(id string) app.Probe // Probe a process
Skills() skills.Skills // get the ffmpeg skills Skills() skills.Skills // Get the ffmpeg skills
ReloadSkills() error // reload the ffmpeg skills ReloadSkills() error // Reload the ffmpeg skills
SetProcessMetadata(id, key string, data interface{}) error // set metatdata to a process SetProcessMetadata(id, key string, data interface{}) error // Set metatdata to a process
GetProcessMetadata(id, key string) (interface{}, error) // get previously set metadata from a process GetProcessMetadata(id, key string) (interface{}, error) // Get previously set metadata from a process
SetMetadata(key string, data interface{}) error // set general metadata SetMetadata(key string, data interface{}) error // Set general metadata
GetMetadata(key string) (interface{}, error) // get previously set general metadata GetMetadata(key string) (interface{}, error) // Get previously set general metadata
} }
// Config is the required configuration for a new restreamer instance. // Config is the required configuration for a new restreamer instance.
@@ -1304,6 +1304,8 @@ func (r *restream) GetPlayout(id, inputid string) (string, error) {
return "127.0.0.1:" + strconv.Itoa(port), nil return "127.0.0.1:" + strconv.Itoa(port), nil
} }
var ErrMetadataKeyNotFound = errors.New("unknown key")
func (r *restream) SetProcessMetadata(id, key string, data interface{}) error { func (r *restream) SetProcessMetadata(id, key string, data interface{}) error {
r.lock.Lock() r.lock.Lock()
defer r.lock.Unlock() defer r.lock.Unlock()
@@ -1350,11 +1352,11 @@ func (r *restream) GetProcessMetadata(id, key string) (interface{}, error) {
} }
data, ok := task.metadata[key] data, ok := task.metadata[key]
if ok { if !ok {
return data, nil return nil, ErrMetadataKeyNotFound
} }
return nil, nil return data, nil
} }
func (r *restream) SetMetadata(key string, data interface{}) error { func (r *restream) SetMetadata(key string, data interface{}) error {
@@ -1393,9 +1395,9 @@ func (r *restream) GetMetadata(key string) (interface{}, error) {
} }
data, ok := r.metadata[key] data, ok := r.metadata[key]
if ok { if !ok {
return data, nil return nil, ErrMetadataKeyNotFound
} }
return nil, nil return data, nil
} }