mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 23:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: config burstObservatory override

Browse Source
This commit is contained in:
lelemka0 2024-03-23 21:25:18 +08:00 committed by yuhan6665
parent fac383672c
commit e2439c0483
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/conf/xray.go
View File

@ -481,6 +481,10 @@ func (c *Config) Override(o *Config, fn string) {
c.Observatory = o.Observatory c.Observatory = o.Observatory
} }
if o.BurstObservatory != nil {
c.BurstObservatory = o.BurstObservatory
}
// deprecated attrs... keep them for now // deprecated attrs... keep them for now
if o.InboundConfig != nil { if o.InboundConfig != nil {
c.InboundConfig = o.InboundConfig c.InboundConfig = o.InboundConfig