mirror of https://github.com/XTLS/Xray-core
Update config.go
parent
dbd9125686
commit
74814a3b4c
|
@ -108,16 +108,13 @@ func LoadConfig(formatName string, input interface{}) (*Config, error) {
|
||||||
files := make([]*ConfigSource, len(v))
|
files := make([]*ConfigSource, len(v))
|
||||||
hasProtobuf := false
|
hasProtobuf := false
|
||||||
for i, file := range v {
|
for i, file := range v {
|
||||||
var f string
|
var f string = formatName
|
||||||
|
|
||||||
if formatName == "auto" {
|
if formatName == "auto" {
|
||||||
|
f = "json"
|
||||||
if file != "stdin:" {
|
if file != "stdin:" {
|
||||||
f = getFormat(file)
|
f = getFormat(file)
|
||||||
} else {
|
|
||||||
f = "json"
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
f = formatName
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if f == "" {
|
if f == "" {
|
||||||
|
|
Loading…
Reference in New Issue