mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

further fixed error handling

This commit is contained in:
Saxon1 2018-04-19 19:33:37 +09:30
parent 920755376e
commit ee6cecd908
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
revid/Revid.go
View File

@ -351,17 +351,17 @@ func (r *revid) outputClips() {
} }
// If the ringbuffer has something we can read and send off // If the ringbuffer has something we can read and send off
if clip, err1 := r.ringBuffer.Read(); err1 == nil { if clip, err := r.ringBuffer.Read(); err == nil {
bytes += len(clip) bytes += len(clip)
errorCount := 0 errorCount := 0
for err2 := r.sendClip(clip); err != nil; errorCount++ { for err := r.sendClip(clip); err != nil; errorCount++ {
if len(clip) >= 11 { if len(clip) >= 11 {
r.Log(Warning, "Send failed trying again!") r.Log(Warning, "Send failed trying again!")
err2 = r.sendClip(clip) err = r.sendClip(clip)
} else { } else {
break break
} }
r.Log(Error, err2.Error()) r.Log(Error, err.Error())
if r.config.Output == NativeRtmp && errorCount > 5 { if r.config.Output == NativeRtmp && errorCount > 5 {
reboot() reboot()
} }
@ -380,8 +380,6 @@ func (r *revid) outputClips() {
prevTime = now prevTime = now
bytes = 0 bytes = 0
} }
} else {
r.Log(Debug, err.Error())
} }
} }
r.Log(Info, "Not outputting clips anymore!") r.Log(Info, "Not outputting clips anymore!")