mirror of
https://github.com/aler9/rtsp-simple-server
synced 2025-10-05 07:36:57 +08:00
rtsp, rtmp: fix ignored errors
This commit is contained in:
@@ -78,22 +78,17 @@ func (s *rtmpSource) log(level logger.Level, format string, args ...interface{})
|
|||||||
func (s *rtmpSource) run() {
|
func (s *rtmpSource) run() {
|
||||||
defer s.wg.Done()
|
defer s.wg.Done()
|
||||||
|
|
||||||
|
outer:
|
||||||
for {
|
for {
|
||||||
ok := func() bool {
|
|
||||||
ok := s.runInner()
|
ok := s.runInner()
|
||||||
if !ok {
|
if !ok {
|
||||||
return false
|
break outer
|
||||||
}
|
}
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case <-time.After(rtmpSourceRetryPause):
|
case <-time.After(rtmpSourceRetryPause):
|
||||||
return true
|
|
||||||
case <-s.ctx.Done():
|
case <-s.ctx.Done():
|
||||||
return false
|
break outer
|
||||||
}
|
|
||||||
}()
|
|
||||||
if !ok {
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,7 +153,7 @@ func (s *rtmpSource) runInner() bool {
|
|||||||
Tracks: tracks,
|
Tracks: tracks,
|
||||||
})
|
})
|
||||||
if res.Err != nil {
|
if res.Err != nil {
|
||||||
return err
|
return res.Err
|
||||||
}
|
}
|
||||||
|
|
||||||
s.log(logger.Info, "ready")
|
s.log(logger.Info, "ready")
|
||||||
|
@@ -177,7 +177,7 @@ func (s *rtspSource) runInner() bool {
|
|||||||
Tracks: conn.Tracks(),
|
Tracks: conn.Tracks(),
|
||||||
})
|
})
|
||||||
if res.Err != nil {
|
if res.Err != nil {
|
||||||
s.log(logger.Info, "ERR: %s", err)
|
s.log(logger.Info, "ERR: %s", res.Err)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user