diff --git a/go.mod b/go.mod index 4c01e2787..9c351b5cd 100644 --- a/go.mod +++ b/go.mod @@ -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-20231017082622-43f077b4e60e - github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b + github.com/livekit/protocol v1.8.2-0.20231026194854-da745471e848 github.com/livekit/psrpc v0.5.0 github.com/mackerelio/go-osstat v0.2.4 github.com/magefile/mage v1.15.0 diff --git a/go.sum b/go.sum index 630b60db0..102ebe137 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,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-20231017082622-43f077b4e60e h1:yNeIo7MSMUWgoLu7LkNKnBYnJBFPFH9Wq4S6h1kS44M= github.com/livekit/mediatransportutil v0.0.0-20231017082622-43f077b4e60e/go.mod h1:+WIOYwiBMive5T81V8B2wdAc2zQNRjNQiJIcPxMTILY= -github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b h1:ExuLaXyk6pGe2DVgXef7YQB0BNA7eDxidmthSkfGB2w= -github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b/go.mod h1:l2WjlZWErS6vBlQaQyCGwWLt1aOx10XfQTsmvLjJWFQ= +github.com/livekit/protocol v1.8.2-0.20231026194854-da745471e848 h1:UtItjtQRAu5mryPebr/ewMlAGUNDNEJJNh6kQ/lkfNc= +github.com/livekit/protocol v1.8.2-0.20231026194854-da745471e848/go.mod h1:l2WjlZWErS6vBlQaQyCGwWLt1aOx10XfQTsmvLjJWFQ= github.com/livekit/psrpc v0.5.0 h1:g+yYNSs6Y1/vM7UlFkB2s/ARe2y3RKWZhX8ata5j+eo= github.com/livekit/psrpc v0.5.0/go.mod h1:1XYH1LLoD/YbvBvt6xg2KQ/J3InLXSJK6PL/+DKmuAU= github.com/mackerelio/go-osstat v0.2.4 h1:qxGbdPkFo65PXOb/F/nhDKpF2nGmGaCFDLXoZjJTtUs= diff --git a/pkg/service/ioservice.go b/pkg/service/ioservice.go index 4a653fbe5..b957e8b15 100644 --- a/pkg/service/ioservice.go +++ b/pkg/service/ioservice.go @@ -38,7 +38,6 @@ type IOInfoService struct { } func NewIOInfoService( - nodeID livekit.NodeID, bus psrpc.MessageBus, es EgressStore, is IngressStore, @@ -126,7 +125,6 @@ func (s *IOInfoService) GetEgress(ctx context.Context, req *rpc.GetEgressRequest } func (s *IOInfoService) ListEgress(ctx context.Context, req *livekit.ListEgressRequest) (*livekit.ListEgressResponse, error) { - var items []*livekit.EgressInfo if req.EgressId != "" { info, err := s.es.LoadEgress(ctx, req.EgressId) if err != nil { @@ -134,16 +132,13 @@ func (s *IOInfoService) ListEgress(ctx context.Context, req *livekit.ListEgressR return nil, err } - if !req.Active || int32(info.Status) < int32(livekit.EgressStatus_EGRESS_COMPLETE) { - items = []*livekit.EgressInfo{info} - } - } else { - var err error - items, err = s.es.ListEgress(ctx, livekit.RoomName(req.RoomName), req.Active) - if err != nil { - logger.Errorw("failed to list egress", err) - return nil, err - } + return &livekit.ListEgressResponse{Items: []*livekit.EgressInfo{info}}, nil + } + + items, err := s.es.ListEgress(ctx, livekit.RoomName(req.RoomName), req.Active) + if err != nil { + logger.Errorw("failed to list egress", err) + return nil, err } return &livekit.ListEgressResponse{Items: items}, nil @@ -223,33 +218,3 @@ func (s *IOInfoService) Stop() { s.ioServer.Shutdown() } } - -// deprecated -func (s *IOInfoService) UpdateEgressInfo(ctx context.Context, info *livekit.EgressInfo) (*emptypb.Empty, error) { - err := s.es.UpdateEgress(ctx, info) - - switch info.Status { - case livekit.EgressStatus_EGRESS_ACTIVE: - s.telemetry.EgressUpdated(ctx, info) - - case livekit.EgressStatus_EGRESS_COMPLETE, - livekit.EgressStatus_EGRESS_FAILED, - livekit.EgressStatus_EGRESS_ABORTED, - livekit.EgressStatus_EGRESS_LIMIT_REACHED: - - // log results - if info.Error != "" { - logger.Errorw("egress failed", errors.New(info.Error), "egressID", info.EgressId) - } else { - logger.Infow("egress ended", "egressID", info.EgressId) - } - - s.telemetry.EgressEnded(ctx, info) - } - if err != nil { - logger.Errorw("could not update egress", err) - return nil, err - } - - return &emptypb.Empty{}, nil -} diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go index cbc3d041a..b3bd269cf 100644 --- a/pkg/service/wire_gen.go +++ b/pkg/service/wire_gen.go @@ -69,7 +69,7 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live } analyticsService := telemetry.NewAnalyticsService(conf, currentNode) telemetryService := telemetry.NewTelemetryService(queuedNotifier, analyticsService) - ioInfoService, err := NewIOInfoService(nodeID, messageBus, egressStore, ingressStore, telemetryService) + ioInfoService, err := NewIOInfoService(messageBus, egressStore, ingressStore, telemetryService) if err != nil { return nil, err }