Fix errors output for webrtc client and server
This commit is contained in:
@@ -77,10 +77,15 @@ func go2rtcClient(url string) (core.Producer, error) {
|
|||||||
// 2. Create PeerConnection
|
// 2. Create PeerConnection
|
||||||
pc, err := PeerConnection(true)
|
pc, err := PeerConnection(true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Err(err).Caller().Send()
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
_ = pc.Close()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
// waiter will wait PC error or WS error or nil (connection OK)
|
// waiter will wait PC error or WS error or nil (connection OK)
|
||||||
var connState core.Waiter
|
var connState core.Waiter
|
||||||
var connMu sync.Mutex
|
var connMu sync.Mutex
|
||||||
@@ -133,7 +138,8 @@ func go2rtcClient(url string) (core.Producer, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if msg.Type != "webrtc/answer" {
|
if msg.Type != "webrtc/answer" {
|
||||||
return nil, errors.New("wrong answer: " + msg.Type)
|
err = errors.New("wrong answer: " + msg.String())
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
answer := msg.String()
|
answer := msg.String()
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ func outputWebRTC(w http.ResponseWriter, r *http.Request) {
|
|||||||
url := r.URL.Query().Get("src")
|
url := r.URL.Query().Get("src")
|
||||||
stream := streams.Get(url)
|
stream := streams.Get(url)
|
||||||
if stream == nil {
|
if stream == nil {
|
||||||
|
http.Error(w, api.StreamNotFound, http.StatusNotFound)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user