mirror of
https://github.com/livekit/livekit.git
synced 2026-09-29 21:58:36 +00:00
Paul Wells
1ba2cadccd
* agent: release JobTerminate handler when job ends before registration JobRequest registered the job's JobTerminate handler after AssignJob returned, so an ended UpdateJobStatus or worker disconnect handled in between deregistered nothing and the handler leaked. AssignJob also sent the assignment before recording the job as running, so an immediate ended update was dropped. Record the job before sending the assignment, and after registering the handler recheck under h.mu that the job is still running and its worker still registered, deregistering otherwise. Fixes #4901 * replace utils.CloneProto with proto.CloneOf * agent: wait on worker readiness and poll for released handlers in test
71 lines
2.1 KiB
Go
71 lines
2.1 KiB
Go
// Copyright 2023 LiveKit, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package clientconfiguration
|
|
|
|
import (
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/livekit/livekit-server/pkg/utils"
|
|
"github.com/livekit/protocol/livekit"
|
|
"github.com/livekit/protocol/logger"
|
|
)
|
|
|
|
type ConfigurationItem struct {
|
|
Match
|
|
Configuration *livekit.ClientConfiguration
|
|
Merge bool
|
|
}
|
|
|
|
type StaticClientConfigurationManager struct {
|
|
confs []ConfigurationItem
|
|
}
|
|
|
|
func NewStaticClientConfigurationManager(confs []ConfigurationItem) *StaticClientConfigurationManager {
|
|
return &StaticClientConfigurationManager{confs: confs}
|
|
}
|
|
|
|
func (s *StaticClientConfigurationManager) GetConfiguration(clientInfo *livekit.ClientInfo) *livekit.ClientConfiguration {
|
|
var matchedConf []*livekit.ClientConfiguration
|
|
for _, c := range s.confs {
|
|
matched, err := c.Match.Match(clientInfo)
|
|
if err != nil {
|
|
logger.Errorw("matchrule failed", err,
|
|
"clientInfo", logger.Proto(utils.ClientInfoWithoutAddress(clientInfo)),
|
|
)
|
|
continue
|
|
}
|
|
if !matched {
|
|
continue
|
|
}
|
|
if !c.Merge {
|
|
return c.Configuration
|
|
}
|
|
matchedConf = append(matchedConf, c.Configuration)
|
|
}
|
|
|
|
var conf *livekit.ClientConfiguration
|
|
for k, v := range matchedConf {
|
|
if k == 0 {
|
|
conf = proto.CloneOf(matchedConf[0])
|
|
} else {
|
|
// TODO : there is a problem use protobuf merge, we don't have flag to indicate 'no value',
|
|
// don't override default behavior or other configuration's field. So a bool value = false or
|
|
// a int value = 0 will override same field in other configuration
|
|
proto.Merge(conf, v)
|
|
}
|
|
}
|
|
return conf
|
|
}
|