diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go index cf2887597..753ce6208 100644 --- a/pkg/service/roommanager.go +++ b/pkg/service/roommanager.go @@ -572,7 +572,7 @@ func (r *RoomManager) HandleConnect( grants *auth.ClaimGrants, createRoom *livekit.CreateRoomRequest, wireMessage *livekit.Signalv2WireMessage, // contains livekit.ConnectRequest -) (*rpc.RelaySignalv2ConnectResponse, error) { +) (*livekit.Signalv2WireMessage, error) { sessionStartTime := time.Now() // find connect request in wire message @@ -610,6 +610,7 @@ func (r *RoomManager) HandleConnect( "nodeID", r.currentNode.NodeID(), "numParticipants", room.GetParticipantCount(), "grants", grants, + "createRoom", logger.Proto(createRoom), "wireMessage", logger.Proto(wireMessage), ) @@ -797,9 +798,7 @@ func (r *RoomManager) HandleConnect( r.iceConfigCache.Put(iceConfigCacheKey{room.Name(), participant.Identity()}, iceConfig) }) - return &rpc.RelaySignalv2ConnectResponse{ - WireMessage: wireMessageResponse, - }, nil + return wireMessageResponse, nil } // create the actual room object, to be used on RTC node diff --git a/pkg/service/signalv2.go b/pkg/service/signalv2.go index 62f422c11..26416e88f 100644 --- a/pkg/service/signalv2.go +++ b/pkg/service/signalv2.go @@ -123,7 +123,14 @@ func (s *defaultSignalv2Handler) HandleConnect( return nil, err } - return s.roomManager.HandleConnect(ctx, grants, rscr.CreateRoom, rscr.WireMessage) + wireMessageResponse, err := s.roomManager.HandleConnect(ctx, grants, rscr.CreateRoom, rscr.WireMessage) + if err != nil { + return nil, err + } + + return &rpc.RelaySignalv2ConnectResponse{ + WireMessage: wireMessageResponse, + }, nil } // ------------------------------------------