From cbec68ae44371323d9cbada9364d1836aa6adc72 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Sat, 8 Jul 2023 12:06:31 -0700 Subject: [PATCH] Do not use cancellable context for Redis operations (#1859) --- pkg/service/redisstore.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/service/redisstore.go b/pkg/service/redisstore.go index a11c318ad..6656757da 100644 --- a/pkg/service/redisstore.go +++ b/pkg/service/redisstore.go @@ -246,9 +246,9 @@ func (s *RedisStore) LockRoom(_ context.Context, roomName livekit.RoomName, dura return "", ErrRoomLockFailed } -func (s *RedisStore) UnlockRoom(ctx context.Context, roomName livekit.RoomName, uid string) error { +func (s *RedisStore) UnlockRoom(_ context.Context, roomName livekit.RoomName, uid string) error { key := RoomLockPrefix + string(roomName) - res, err := s.unlockScript.Run(ctx, s.rc, []string{key}, uid).Result() + res, err := s.unlockScript.Run(s.ctx, s.rc, []string{key}, uid).Result() if err != nil { return err } @@ -708,7 +708,7 @@ func (s *RedisStore) LoadIngressFromStreamKey(_ context.Context, streamKey strin } } -func (s *RedisStore) ListIngress(ctx context.Context, roomName livekit.RoomName) ([]*livekit.IngressInfo, error) { +func (s *RedisStore) ListIngress(_ context.Context, roomName livekit.RoomName) ([]*livekit.IngressInfo, error) { var infos []*livekit.IngressInfo if roomName == "" {