LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Give more useful error messages and don't panic on bad disconnects. Closes #673

Browse Source
This commit is contained in:
Gabe Kangas 2021-01-29 11:25:18 -08:00
parent b2f6c62eda
commit 89cf6115b3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/rtmp/rtmp.go
View File

@ -87,7 +87,7 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
return return
} }
log.Infoln("Incoming RTMP connected.") log.Infoln("Inbound stream connected.")
_setStreamAsConnected() _setStreamAsConnected()
pipePath := utils.GetTemporaryPipePath() pipePath := utils.GetTemporaryPipePath()
@ -104,7 +104,7 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
f, err := os.OpenFile(pipePath, os.O_RDWR, os.ModeNamedPipe) f, err := os.OpenFile(pipePath, os.O_RDWR, os.ModeNamedPipe)
_pipe = f _pipe = f
if err != nil { if err != nil {
panic(err) log.Fatalln("unable to open", pipePath, "and will exit")
} }
w := flv.NewMuxer(f) w := flv.NewMuxer(f)
@ -118,23 +118,26 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) {
if err := _rtmpConnection.SetReadDeadline(time.Now().Add(10 * time.Second)); err != nil { if err := _rtmpConnection.SetReadDeadline(time.Now().Add(10 * time.Second)); err != nil {
log.Warnln(err) log.Warnln(err)
} }
pkt, err := c.ReadPacket() pkt, err := c.ReadPacket()
// Broadcaster disconnected // Broadcaster disconnected
if err == io.EOF { if err == io.EOF {
handleDisconnect(nc) handleDisconnect(nc)
break return
} }
// Read timeout. Disconnect. // Read timeout. Disconnect.
if neterr, ok := err.(net.Error); ok && neterr.Timeout() { if neterr, ok := err.(net.Error); ok && neterr.Timeout() {
log.Debugln("Timeout reading the inbound stream from the broadcaster. Assuming that they disconnected and ending the stream.") log.Debugln("Timeout reading the inbound stream from the broadcaster. Assuming that they disconnected and ending the stream.")
handleDisconnect(nc) handleDisconnect(nc)
break return
} }
if err := w.WritePacket(pkt); err != nil { if err := w.WritePacket(pkt); err != nil {
panic(err) log.Errorln("unable to write rtmp packet", err)
handleDisconnect(nc)
return
} }
} }
} }
@ -144,7 +147,7 @@ func handleDisconnect(conn net.Conn) {
return return
} }
log.Infoln("RTMP disconnected.") log.Infoln("Inbound stream disconnected.")
conn.Close() conn.Close()
_pipe.Close() _pipe.Close()
_hasInboundRTMPConnection = false _hasInboundRTMPConnection = false