[patch] only log error if start rtmps failed #230

pull/236/head
q191201771 2 years ago
parent b4d918cbe5
commit ee80e60a7c

@ -225,14 +225,15 @@ func (sm *ServerManager) RunLoop() error {
}
if sm.rtmpsServer != nil {
if err := sm.rtmpsServer.ListenWithTLS(sm.config.RtmpConfig.RtmpsCertFile, sm.config.RtmpConfig.RtmpsKeyFile); err != nil {
return err
err := sm.rtmpsServer.ListenWithTLS(sm.config.RtmpConfig.RtmpsCertFile, sm.config.RtmpConfig.RtmpsKeyFile)
// rtmps启动失败影响降级当rtmps启动时我们并不返回错误保证不因为rtmps影响其他服务
if err == nil {
go func() {
if errRun := sm.rtmpsServer.RunLoop(); errRun != nil {
Log.Error(errRun)
}
}()
}
go func() {
if err := sm.rtmpsServer.RunLoop(); err != nil {
Log.Error(err)
}
}()
}
if sm.rtspServer != nil {

@ -64,6 +64,7 @@ func (server *Server) ListenWithTLS(certFile, keyFile string) (err error) {
}
tlsConfig := &tls.Config{Certificates: []tls.Certificate{cert}}
if server.ln, err = tls.Listen("tcp", server.addr, tlsConfig); err != nil {
Log.Errorf("start rtmps server listen failed. addr=%s, err=%+v", server.addr, err)
return
}
Log.Infof("start rtmps server listen. addr=%s", server.addr)

Loading…
Cancel
Save