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

Wait for process to exit when stopping

Browse Source 
If a process has some cleanup with purge-on-delete defined, the purge
has to wait until the process actually exited. Otherwise it may happen
that the process got the signal, files are purged, but the process is
still writing some files in order to exit cleanly. This would lead to
some artefacts left on the filesystem.
This commit is contained in:
Ingo Oppermann
2022-08-17 15:12:22 +03:00
parent e4463953b6
commit 50deaef4d3
5 changed files with 92 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
process/process_test.go
View File

@@ -28,7 +28,7 @@ func TestProcess(t *testing.T) {
require.Equal(t, "running", p.Status().State)
p.Stop()
p.Stop(false)
time.Sleep(2 * time.Second)
@@ -52,7 +52,7 @@ func TestReconnectProcess(t *testing.T) {
require.Equal(t, "finished", p.Status().State)
p.Stop()
p.Stop(false)
require.Equal(t, "finished", p.Status().State)
}
@@ -73,7 +73,7 @@ func TestStaleProcess(t *testing.T) {
require.Equal(t, "killed", p.Status().State)
p.Stop()
p.Stop(false)
require.Equal(t, "killed", p.Status().State)
}
@@ -94,7 +94,7 @@ func TestStaleReconnectProcess(t *testing.T) {
require.Equal(t, "killed", p.Status().State)
p.Stop()
p.Stop(false)
require.Equal(t, "killed", p.Status().State)
}
@@ -116,7 +116,7 @@ func TestNonExistingProcess(t *testing.T) {
require.Equal(t, "failed", p.Status().State)
p.Stop()
p.Stop(false)
require.Equal(t, "failed", p.Status().State)
}
@@ -138,7 +138,7 @@ func TestNonExistingReconnectProcess(t *testing.T) {
require.Equal(t, "failed", p.Status().State)
p.Stop()
p.Stop(false)
require.Equal(t, "failed", p.Status().State)
}
@@ -157,11 +157,35 @@ func TestProcessFailed(t *testing.T) {
time.Sleep(5 * time.Second)
p.Stop()
p.Stop(false)
require.Equal(t, "failed", p.Status().State)
}
func TestFFmpegWaitStop(t *testing.T) {
binary, err := testhelper.BuildBinary("sigintwait", "../internal/testhelper")
require.NoError(t, err, "Failed to build helper program")
p, _ := New(Config{
Binary: binary,
Args: []string{},
Reconnect: false,
StaleTimeout: 0,
OnExit: func() {
time.Sleep(2 * time.Second)
},
})
err = p.Start()
require.NoError(t, err)
time.Sleep(4 * time.Second)
p.Stop(true)
require.Equal(t, "finished", p.Status().State)
}
func TestFFmpegKill(t *testing.T) {
binary, err := testhelper.BuildBinary("sigint", "../internal/testhelper")
require.NoError(t, err, "Failed to build helper program")
@@ -178,7 +202,7 @@ func TestFFmpegKill(t *testing.T) {
time.Sleep(5 * time.Second)
p.Stop()
p.Stop(false)
time.Sleep(3 * time.Second)
@@ -201,7 +225,7 @@ func TestProcessForceKill(t *testing.T) {
time.Sleep(3 * time.Second)
p.Stop()
p.Stop(false)
time.Sleep(1 * time.Second)