dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 22:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

increase level for signal stream closed log messages (#1660)

Browse Source 
* increase level for signal stream closed log messages

* ensure stream closes on signal close receipt

* cleanup
This commit is contained in:
Paul Wells
2023-04-27 08:30:40 -07:00
committed by GitHub
parent c1c4e8aea0
commit fc09cacfce
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/routing/signal.go
View File

@@ -111,13 +111,13 @@ func (r *signalClient) StartParticipantSignal(
r.active.Inc()
defer r.active.Dec()
err = CopySignalStreamToMessageChannel[*rpc.RelaySignalRequest, *rpc.RelaySignalResponse](
err := CopySignalStreamToMessageChannel[*rpc.RelaySignalRequest, *rpc.RelaySignalResponse](
stream,
resChan,
signalResponseMessageReader{},
r.config,
)
l.Debugw("participant signal stream closed", "error", err)
l.Infow("signal stream closed", "error", err)
resChan.Close()
}()
@@ -189,7 +189,7 @@ func CopySignalStreamToMessageChannel[SendType, RecvType RelaySignalMessage](
}
if msg.GetClose() {
return psrpc.ErrStreamClosed
return stream.Close(nil)
}
}
return stream.Err()

3
pkg/service/signal.go
View File

@@ -152,10 +152,11 @@ func (r *signalService) RelaySignal(stream psrpc.ServerStream[*rpc.RelaySignalRe
err = r.sessionHandler(ctx, livekit.RoomName(ss.RoomName), *pi, livekit.ConnectionID(ss.ConnectionId), reqChan, sink)
if err != nil {
l.Errorw("could not handle new participant", err)
return
}
err = routing.CopySignalStreamToMessageChannel[*rpc.RelaySignalResponse, *rpc.RelaySignalRequest](stream, reqChan, signalRequestMessageReader{}, r.config)
l.Debugw("participant signal stream closed", "error", err)
l.Infow("signal stream closed", "error", err)
return
}