From a53deecb826f00ac5bdf665d46ccdec4758ebaff Mon Sep 17 00:00:00 2001 From: David Colburn Date: Tue, 3 Aug 2021 00:19:19 -0700 Subject: [PATCH] revert recording apis --- go.mod | 2 +- go.sum | 4 ++-- pkg/service/roomservice.go | 30 ------------------------------ 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 2451d8303..1e1747d4d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/google/wire v0.5.0 github.com/gorilla/websocket v1.4.2 github.com/jxskiss/base62 v0.0.0-20191017122030-4f11678b909b - github.com/livekit/protocol v0.6.1 + github.com/livekit/protocol v0.6.4 github.com/magefile/mage v1.11.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0 github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index ccfd4aaa7..1a7c91f6c 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,8 @@ github.com/lithammer/shortuuid/v3 v3.0.6 h1:pr15YQyvhiSX/qPxncFtqk+v4xLEpOZObbsY github.com/lithammer/shortuuid/v3 v3.0.6/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts= github.com/livekit/ion-sfu v1.20.6 h1:vA98RfuW3sSidV1rfK+/szGWgHFgki4Q4pomxsJS0i0= github.com/livekit/ion-sfu v1.20.6/go.mod h1:dEdOG4KSqIftr5HxxqciNKBIdu0v3OD0ZYL7A3J09KA= -github.com/livekit/protocol v0.6.1 h1:+AwPkBNZoUYCoGwmwGxsdNQN7bickSyVt1p1jQi3m2U= -github.com/livekit/protocol v0.6.1/go.mod h1:wo3CGfYB7XMF8GoVJAfTARrYSP/ombi+sbLl6AYdKP0= +github.com/livekit/protocol v0.6.4 h1:0xJQz/NzAKIYBuJPjgerooMWQc40xg4KhJ0abLamULA= +github.com/livekit/protocol v0.6.4/go.mod h1:wo3CGfYB7XMF8GoVJAfTARrYSP/ombi+sbLl6AYdKP0= github.com/lucsky/cuid v1.0.2 h1:z4XlExeoderxoPj2/dxKOyPxe9RCOu7yNq9/XWxIUMQ= github.com/lucsky/cuid v1.0.2/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= diff --git a/pkg/service/roomservice.go b/pkg/service/roomservice.go index a84f1e05c..bf8f4fb49 100644 --- a/pkg/service/roomservice.go +++ b/pkg/service/roomservice.go @@ -220,36 +220,6 @@ func (s *RoomService) UpdateSubscriptions(ctx context.Context, req *livekit.Upda return &livekit.UpdateSubscriptionsResponse{}, nil } -func (s *RoomService) RecordRoom(ctx context.Context, req *livekit.RecordRoomRequest) (*livekit.RecordingResponse, error) { - if s.recorder == nil { - return nil, errors.New("recording not configured (redis required)") - } - - id, err := s.recorder.ReserveRecorder(ctx, req) - if err != nil { - return nil, err - } - - err = s.recorder.StartRecording(ctx, id) - if err != nil { - return nil, err - } - - return &livekit.RecordingResponse{RecordingId: id}, nil -} - -func (s *RoomService) EndRoomRecording(ctx context.Context, req *livekit.EndRecordingRequest) (*livekit.RecordingResponse, error) { - if s.recorder == nil { - return nil, errors.New("recording not configured (redis required)") - } - - err := s.recorder.EndRecording(ctx, req.RecordingId) - if err != nil { - return nil, err - } - return &livekit.RecordingResponse{RecordingId: req.RecordingId}, nil -} - func (s *RoomService) createRTCSink(ctx context.Context, room, identity string) (routing.MessageSink, error) { if err := EnsureAdminPermission(ctx, room); err != nil { return nil, twirpAuthError(err)