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

list egress by id (#1404)

Browse Source 
* list egress by id

* update proto ref
This commit is contained in:
David Colburn
2023-02-09 00:10:54 -08:00
committed by GitHub
parent 403c23ef82
commit d2f0496223
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -18,7 +18,7 @@ require (
github.com/jxskiss/base62 v1.1.0
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a
github.com/livekit/protocol v1.3.3-0.20230206022348-f6d32e15b011
github.com/livekit/protocol v1.3.3-0.20230209080154-800036bdb4cb
github.com/livekit/psrpc v0.2.5
github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995
github.com/mackerelio/go-osstat v0.2.3
go.sum
+2 -2
View File
@@ -234,8 +234,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a h1:5UkGQpskXp7HcBmyrCwWtO7ygDWbqtjN09Yva4l/nyE=
github.com/livekit/mediatransportutil v0.0.0-20230130133657-96cfb115473a/go.mod h1:1Dlx20JPoIKGP45eo+yuj0HjeE25zmyeX/EWHiPCjFw=
github.com/livekit/protocol v1.3.3-0.20230206022348-f6d32e15b011 h1:KUuxp1D8ok4tgQ5gzxfUSj0o0GFMy1zwveru1r5kk9w=
github.com/livekit/protocol v1.3.3-0.20230206022348-f6d32e15b011/go.mod h1:gwCG03nKlHlC9hTjL4pXQpn783ALhmbyhq65UZxqbb8=
github.com/livekit/protocol v1.3.3-0.20230209080154-800036bdb4cb h1:5UPq90al/Yqngtxh2d35pRpPLVxc+8fmHBTm4JWp0bM=
github.com/livekit/protocol v1.3.3-0.20230209080154-800036bdb4cb/go.mod h1:gwCG03nKlHlC9hTjL4pXQpn783ALhmbyhq65UZxqbb8=
github.com/livekit/psrpc v0.2.5 h1:+EZS78MGdBZxzCUwinDQ6pOeqPDURisrGtfyyqwUDSI=
github.com/livekit/psrpc v0.2.5/go.mod h1:DyphtRRWvcIuCaldYg9VGpwGhu/HiKmNcysgpN6xKrM=
github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 h1:vOaY2qvfLihDyeZtnGGN1Law9wRrw8BMGCr1TygTvMw=
pkg/service/egress.go
+17 -7
View File
@@ -6,15 +6,15 @@ import (
"fmt"
"reflect"
"github.com/twitchtv/twirp"
"github.com/livekit/livekit-server/pkg/rtc"
"github.com/livekit/livekit-server/pkg/service/rpc"
"github.com/livekit/livekit-server/pkg/telemetry"
"github.com/livekit/protocol/egress"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
"github.com/twitchtv/twirp"
"github.com/livekit/livekit-server/pkg/telemetry"
)
type EgressService struct {
@@ -281,12 +281,22 @@ func (s *EgressService) ListEgress(ctx context.Context, req *livekit.ListEgressR
return nil, ErrEgressNotConnected
}
infos, err := s.es.ListEgress(ctx, livekit.RoomName(req.RoomName))
if err != nil {
return nil, err
var items []*livekit.EgressInfo
if req.EgressId != "" {
info, err := s.es.LoadEgress(ctx, req.EgressId)
if err != nil {
return nil, err
}
items = []*livekit.EgressInfo{info}
} else {
var err error
items, err = s.es.ListEgress(ctx, livekit.RoomName(req.RoomName))
if err != nil {
return nil, err
}
}
return &livekit.ListEgressResponse{Items: infos}, nil
return &livekit.ListEgressResponse{Items: items}, nil
}
func (s *EgressService) StopEgress(ctx context.Context, req *livekit.StopEgressRequest) (*livekit.EgressInfo, error) {