diff --git a/pkg/clientconfiguration/conf.go b/pkg/clientconfiguration/conf.go index 8348a1d1e..b8d32aa6a 100644 --- a/pkg/clientconfiguration/conf.go +++ b/pkg/clientconfiguration/conf.go @@ -33,7 +33,7 @@ var StaticConfigurations = []ConfigurationItem{ // Merge: false, // }, { - Match: &ScriptMatch{Expr: `(c.device_model == "xiaomi 2201117ti" && c.os == "android) || + Match: &ScriptMatch{Expr: `(c.device_model == "xiaomi 2201117ti" && c.os == "android") || ((c.browser == "firefox" || c.browser == "firefox mobile") && (c.os == "linux" || c.os == "android"))`}, Configuration: &livekit.ClientConfiguration{ DisabledCodecs: &livekit.DisabledCodecs{ diff --git a/pkg/clientconfiguration/conf_test.go b/pkg/clientconfiguration/conf_test.go index 947766e3e..37c2f991c 100644 --- a/pkg/clientconfiguration/conf_test.go +++ b/pkg/clientconfiguration/conf_test.go @@ -99,8 +99,7 @@ func TestScriptMatch(t *testing.T) { {name: "invalid expr", expr: `cc.protocol > 5`, err: true}, {name: "unexist field", expr: `c.protocols > 5`, err: true}, {name: "combined condition", expr: `c.protocol > 5 && (c.sdk=="android" || c.sdk=="ios")`, result: true}, - {name: "combined condition2", expr: `(c.device_model == "xiaomi 2201117ti" && c.os == "android) || - ((c.browser == "firefox" || c.browser == "firefox mobile") && (c.os == "linux" || c.os == "android"))`, result: false}, + {name: "combined condition2", expr: `(c.device_model == "xiaomi 2201117ti" && c.os == "android) || ((c.browser == "firefox" || c.browser == "firefox mobile") && (c.os == "linux" || c.os == "android"))`, result: false}, } for _, c := range cases { diff --git a/pkg/clientconfiguration/staticconfiguration.go b/pkg/clientconfiguration/staticconfiguration.go index 2071d9112..2d0fcf984 100644 --- a/pkg/clientconfiguration/staticconfiguration.go +++ b/pkg/clientconfiguration/staticconfiguration.go @@ -15,8 +15,6 @@ package clientconfiguration import ( - "fmt" - "google.golang.org/protobuf/proto" "github.com/livekit/protocol/livekit" @@ -42,7 +40,7 @@ func (s *StaticClientConfigurationManager) GetConfiguration(clientInfo *livekit. for _, c := range s.confs { matched, err := c.Match.Match(clientInfo) if err != nil { - logger.Errorw(fmt.Sprintf("matchrule failed, clientInfo: %s", clientInfo.String()), err) + logger.Errorw("matchrule failed", err, "clientInfo", clientInfo.String()) continue } if !matched {