dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-05-14 22:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import ErrIngressOutOfDate from protocol (#987)

Browse Source
This commit is contained in:
Benjamin Pracht
2022-09-06 16:05:17 -07:00
committed by GitHub
parent 7bf61b55f4
commit aaeba74402
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -16,7 +16,7 @@ require (
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/golang-lru v0.5.4
github.com/livekit/protocol v1.0.2-0.20220831180559-284d6b27297a
github.com/livekit/protocol v1.0.2-0.20220906220530-df2069bbbec1
github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995
github.com/mackerelio/go-osstat v0.2.3
github.com/magefile/mage v1.13.0
go.sum
+2
View File
@@ -242,6 +242,8 @@ github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJV
github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
github.com/livekit/protocol v1.0.2-0.20220831180559-284d6b27297a h1:UY0lVZdEixOguIApMxWRqLEYj7tSJDJguvzhJaPtl/Y=
github.com/livekit/protocol v1.0.2-0.20220831180559-284d6b27297a/go.mod h1:ykRtMmaq4blqGyLWWPtYkB/74JYsyK7N2DAXLGnfSa4=
github.com/livekit/protocol v1.0.2-0.20220906220530-df2069bbbec1 h1:jjykqJJ0uQ+2HBIkkC/wpdbuKyawNfy7LzGVGRXQTc4=
github.com/livekit/protocol v1.0.2-0.20220906220530-df2069bbbec1/go.mod h1:ykRtMmaq4blqGyLWWPtYkB/74JYsyK7N2DAXLGnfSa4=
github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995 h1:vOaY2qvfLihDyeZtnGGN1Law9wRrw8BMGCr1TygTvMw=
github.com/livekit/rtcscore-go v0.0.0-20220815072451-20ee10ae1995/go.mod h1:116ych8UaEs9vfIE8n6iZCZ30iagUFTls0vRmC+Ix5U=
github.com/mackerelio/go-osstat v0.2.3 h1:jAMXD5erlDE39kdX2CU7YwCGRcxIO33u/p8+Fhe5dJw=
pkg/service/errors.go
-1
View File
@@ -16,5 +16,4 @@ var (
ErrRoomUnlockFailed = errors.New("could not unlock room, lock token does not match")
ErrTrackNotFound = errors.New("track is not found")
ErrWebHookMissingAPIKey = errors.New("api_key is required to use webhooks")
ErrIngressOutOfDate = errors.New("trying to ovewrite an ingress with an older version")
)
pkg/service/redisstore.go
+2 -1
View File
@@ -13,6 +13,7 @@ import (
"google.golang.org/protobuf/proto"
"github.com/livekit/livekit-server/version"
"github.com/livekit/protocol/ingress"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/utils"
@@ -474,7 +475,7 @@ func (s *RedisStore) StoreIngress(_ context.Context, info *livekit.IngressInfo)
results, err := tx.TxPipelined(s.ctx, func(p redis.Pipeliner) error {
if info.State.StartedAt < oldStartedAt {
// Do not overwrite the info and state of a more recent session
return ErrIngressOutOfDate
return ingress.ErrIngressOutOfDate
}
p.HSet(s.ctx, IngressKey, info.IngressId, data)
pkg/service/redisstore_test.go
+2 -1
View File
@@ -10,6 +10,7 @@ import (
"go.uber.org/atomic"
"google.golang.org/protobuf/proto"
"github.com/livekit/protocol/ingress"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
@@ -256,7 +257,7 @@ func TestIngressStore(t *testing.T) {
info.RoomName = "room2"
info.State.StartedAt = 1
err = rs.UpdateIngress(ctx, info)
require.Equal(t, service.ErrIngressOutOfDate, err)
require.Equal(t, ingress.ErrIngressOutOfDate, err)
info.RoomName = "room2"
info.State.StartedAt = 3