Browse Source

fix freeze when server is shut down and runOnPublish is not empty

pull/764/head
aler9 5 years ago
parent
commit
8337a90b29
  1. 13
      internal/core/path.go

13
internal/core/path.go

@ -476,13 +476,7 @@ func (pa *path) run() {
req.res <- pathReaderSetupPlayRes{err: fmt.Errorf("terminated")} req.res <- pathReaderSetupPlayRes{err: fmt.Errorf("terminated")}
} }
for rp := range pa.readers { pa.sourceSetNotReady()
rp.close()
}
if pa.stream != nil {
pa.stream.close()
}
if pa.source != nil { if pa.source != nil {
if source, ok := pa.source.(sourceStatic); ok { if source, ok := pa.source.(sourceStatic); ok {
@ -639,12 +633,15 @@ func (pa *path) sourceSetNotReady() {
if pa.onPublishCmd != nil { if pa.onPublishCmd != nil {
pa.onPublishCmd.Close() pa.onPublishCmd.Close()
pa.onPublishCmd = nil pa.onPublishCmd = nil
pa.log(logger.Info, "runOnPublish command stopped") pa.log(logger.Info, "runOnReady command stopped")
} }
pa.sourceReady = false pa.sourceReady = false
if pa.stream != nil {
pa.stream.close() pa.stream.close()
pa.stream = nil pa.stream = nil
}
} }
func (pa *path) staticSourceCreate() { func (pa *path) staticSourceCreate() {

Loading…
Cancel
Save