mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-05 14:43:03 +00:00
fa5d7a255b
* v5: Health Check & LeastLoad Strategy (rebased from 2c5a71490368500a982018a74a6d519c7e121816) Some changes will be necessary to integrate it into V2Ray * Update proto * parse duration conf with time.Parse() * moving health ping to observatory as a standalone component * moving health ping to observatory as a standalone component: auto generated file * add initialization for health ping * incorporate changes in router implementation * support principle target output * add v4 json support for BurstObservatory & fix balancer reference * update API command * remove cancelled API * return zero length value when observer is not found * remove duplicated targeted dispatch * adjust test with updated structure * bug fix for observer * fix strategy selector * fix strategy least load * Fix ticker usage ticker.Close does not close ticker.C * feat: Replace default Health Ping URL to HTTPS (#1991) * fix selectLeastLoad() returns wrong number of nodes (#2083) * Test: fix leastload strategy unit test * fix(router): panic caused by concurrent map read and write (#2678) * Clean up code --------- Co-authored-by: Jebbs <qjebbs@gmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: 世界 <i@sekai.icu> Co-authored-by: Bernd Eichelberger <46166740+4-FLOSS-Free-Libre-Open-Source-Software@users.noreply.github.com> Co-authored-by: 秋のかえで <autmaple@protonmail.com> Co-authored-by: Rinka <kujourinka@gmail.com>
35 lines
1.1 KiB
Go
35 lines
1.1 KiB
Go
package conf
|
|
|
|
import (
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/xtls/xray-core/app/observatory"
|
|
"github.com/xtls/xray-core/app/observatory/burst"
|
|
"github.com/xtls/xray-core/infra/conf/cfgcommon/duration"
|
|
)
|
|
|
|
type ObservatoryConfig struct {
|
|
SubjectSelector []string `json:"subjectSelector"`
|
|
ProbeURL string `json:"probeURL"`
|
|
ProbeInterval duration.Duration `json:"probeInterval"`
|
|
EnableConcurrency bool `json:"enableConcurrency"`
|
|
}
|
|
|
|
func (o *ObservatoryConfig) Build() (proto.Message, error) {
|
|
return &observatory.Config{SubjectSelector: o.SubjectSelector, ProbeUrl: o.ProbeURL, ProbeInterval: int64(o.ProbeInterval), EnableConcurrency: o.EnableConcurrency}, nil
|
|
}
|
|
|
|
type BurstObservatoryConfig struct {
|
|
SubjectSelector []string `json:"subjectSelector"`
|
|
// health check settings
|
|
HealthCheck *healthCheckSettings `json:"pingConfig,omitempty"`
|
|
}
|
|
|
|
func (b BurstObservatoryConfig) Build() (proto.Message, error) {
|
|
if result, err := b.HealthCheck.Build(); err == nil {
|
|
return &burst.Config{SubjectSelector: b.SubjectSelector, PingConfig: result.(*burst.HealthPingConfig)}, nil
|
|
} else {
|
|
return nil, err
|
|
}
|
|
}
|