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

Merge branch 'dev' into vod

Browse Source
This commit is contained in:
Ingo Oppermann
2023-04-24 16:14:32 +02:00
parent c1bbb4065c b58cc8a7ee
commit 3e7e5d5c9c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
process/process.go
View File

@@ -650,6 +650,10 @@ func (p *process) stop(wait bool) error {
if p.callbacks.onExit == nil { if p.callbacks.onExit == nil {
p.callbacks.onExit = func(string) { p.callbacks.onExit = func(string) {
wg.Done() wg.Done()
p.callbacks.lock.Lock()
defer p.callbacks.lock.Unlock()
p.callbacks.onExit = nil p.callbacks.onExit = nil
} }
} else { } else {
@@ -657,6 +661,10 @@ func (p *process) stop(wait bool) error {
p.callbacks.onExit = func(state string) { p.callbacks.onExit = func(state string) {
cb(state) cb(state)
wg.Done() wg.Done()
p.callbacks.lock.Lock()
defer p.callbacks.lock.Unlock()
p.callbacks.onExit = cb p.callbacks.onExit = cb
} }
} }

4
restream/restream_test.go
View File

@@ -229,7 +229,7 @@ func TestUpdateProcess(t *testing.T) {
process, err := rs.GetProcess(process2.ID) process, err := rs.GetProcess(process2.ID)
require.NoError(t, err) require.NoError(t, err)
//createdAt := process.CreatedAt createdAt := process.CreatedAt
updatedAt := process.UpdatedAt updatedAt := process.UpdatedAt
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
@@ -251,7 +251,7 @@ func TestUpdateProcess(t *testing.T) {
process, err = rs.GetProcess(process3.ID) process, err = rs.GetProcess(process3.ID)
require.NoError(t, err) require.NoError(t, err)
//require.Equal(t, createdAt, process.CreatedAt) require.NotEqual(t, createdAt, process.CreatedAt) // this should be equal, but will require a major version jump
require.NotEqual(t, updatedAt, process.UpdatedAt) require.NotEqual(t, updatedAt, process.UpdatedAt)
} }