Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow reconnections when the output fails #164

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Allow reconnections when the output fails #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb80ad3
WiP
biglittlebigben Nov 9, 2023
ce2b3d3
WiP
biglittlebigben Nov 10, 2023
22de6de
Update SDK
biglittlebigben Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func runService(c *cli.Context) error {
}

bus := psrpc.NewRedisMessageBus(rc)
psrpcClient, err := rpc.NewIOInfoClient(conf.NodeID, bus)
psrpcClient, err := rpc.NewIOInfoClient(bus)
if err != nil {
return err
}
Expand All @@ -124,7 +124,7 @@ func runService(c *cli.Context) error {
rtmpsrv = rtmp.NewRTMPServer()
}
if conf.WHIPPort > 0 {
psrpcWHIPClient, err := rpc.NewIngressHandlerClient(conf.NodeID, bus)
psrpcWHIPClient, err := rpc.NewIngressHandlerClient(bus)
if err != nil {
return err
}
Expand All @@ -134,7 +134,7 @@ func runService(c *cli.Context) error {

svc := service.NewService(conf, psrpcClient, bus, whipsrv)

_, err = rpc.NewIngressInternalServer(conf.NodeID, svc, bus)
_, err = rpc.NewIngressInternalServer(svc, bus)
if err != nil {
return err
}
Expand Down Expand Up @@ -252,7 +252,7 @@ func runHandler(c *cli.Context) error {
}

bus := psrpc.NewRedisMessageBus(rc)
rpcClient, err := rpc.NewIOInfoClient(conf.NodeID, bus)
rpcClient, err := rpc.NewIOInfoClient(bus)
if err != nil {
return err
}
Expand Down Expand Up @@ -283,7 +283,7 @@ func runHandler(c *cli.Context) error {
}

func setupHandlerRPCHandlers(conf *config.Config, handler *service.Handler, bus psrpc.MessageBus, info *livekit.IngressInfo, ep any) error {
rpcServer, err := rpc.NewIngressHandlerServer(conf.NodeID, handler, bus)
rpcServer, err := rpc.NewIngressHandlerServer(handler, bus)
if err != nil {
return err
}
Expand Down
37 changes: 19 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ require (
github.com/gorilla/mux v1.8.0
github.com/livekit/go-rtmp v0.0.0-20230829211117-1c4f5a5c81ed
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f
github.com/livekit/protocol v1.7.3-0.20231002023823-525419ade0bf
github.com/livekit/psrpc v0.3.3
github.com/livekit/server-sdk-go v1.0.17-0.20230928233454-b49bf45b164b
github.com/livekit/mediatransportutil v0.0.0-20231017082622-43f077b4e60e
github.com/livekit/protocol v1.9.0
github.com/livekit/psrpc v0.5.0
github.com/livekit/server-sdk-go v1.1.2-0.20231113183636-7e90bc64e464
github.com/pion/dtls/v2 v2.2.7
github.com/pion/interceptor v0.1.24
github.com/pion/rtcp v1.2.10
github.com/pion/rtp v1.8.2
github.com/pion/interceptor v0.1.25
github.com/pion/rtcp v1.2.12
github.com/pion/rtp v1.8.3
github.com/pion/webrtc/v3 v3.2.21
github.com/prometheus/client_golang v1.17.0
github.com/sirupsen/logrus v1.9.3
Expand All @@ -44,24 +44,24 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/jxskiss/base62 v1.1.0 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/lithammer/shortuuid/v4 v4.0.0 // indirect
github.com/mackerelio/go-osstat v0.2.4 // indirect
github.com/magefile/mage v1.15.0 // indirect
github.com/mattn/go-pointer v0.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/nats-io/nats.go v1.28.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/nats.go v1.31.0 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/ice/v2 v2.3.11 // indirect
Expand All @@ -79,20 +79,21 @@ require (
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/redis/go-redis/v9 v9.1.0 // indirect
github.com/redis/go-redis/v9 v9.2.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/thoas/go-funk v0.9.3 // indirect
github.com/twitchtv/twirp v8.1.3+incompatible // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yutopp/go-amf0 v0.1.0 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.25.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
)
Loading
Loading