RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-15 11:14:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid deadlock when a runOnPublish command is reading and the publisher times out (#595) (#495)

Browse Source
This commit is contained in:
aler9 2021-10-03 15:58:24 +02:00
parent 160966e81b
commit d2c668ceea
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/core/path.go
View File

@ -564,17 +564,22 @@ func (pa *path) sourceSetReady(tracks gortsplib.Tracks) {
}
func (pa *path) sourceSetNotReady() {
for r := range pa.readers {
pa.doReaderRemove(r)
r.Close()
}
// close onPublishCmd after all readers have been closed.
// this avoids a deadlock in which onPublishCmd is a
// RTSP reader that sends a TEARDOWN request and waits
// for the response (like FFmpeg), but it can't since
/// the path is already waiting for the command to close.
if pa.onPublishCmd != nil {
pa.onPublishCmd.Close()
pa.onPublishCmd = nil
pa.Log(logger.Info, "runOnPublish command stopped")
}
for r := range pa.readers {
pa.doReaderRemove(r)
r.Close()
}
pa.sourceReady = false
pa.stream.close()
pa.stream = nil