github/trojan-go
4
0
Fork 0
mirror of https://github.com/p4gefau1t/trojan-go.git synced 2024-04-21 12:21:34 +00:00
Code Issues Releases Wiki Activity

Refinement: change the default behavior of reading default configurations (#346)

Browse Source 
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
This commit is contained in:
Sousa Chinensis
2021-05-31 14:44:56 +08:00
committed by GitHub
co-authored by loyalsoldier
parent 907ebd63b6
commit d538823b1e
1 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/option.go
+54 -18
View File
@@ -23,31 +23,67 @@ func (o *Option) Name() string {
return Name
}
func (o *Option) Handle() error {
data, err := ioutil.ReadFile(*o.path)
func detectAndReadConfig(file string) ([]byte, bool, error) {
isJSON := false
switch {
case strings.HasSuffix(file, ".json"):
isJSON = true
case strings.HasSuffix(file, ".yaml"), strings.HasSuffix(file, ".yml"):
isJSON = false
default:
log.Fatalf("unsupported config format: %s. use .yaml or .json instead.", file)
}
data, err := ioutil.ReadFile(file)
if err != nil {
log.Fatal(err)
return nil, false, err
}
return data, isJSON, nil
}
func (o *Option) Handle() error {
defaultConfigPath := []string{
"config.json",
"config.yml",
"config.yaml",
}
isJSON := false
switch {
case strings.HasSuffix(*o.path, ".json"):
isJSON = true
case strings.HasSuffix(*o.path, ".yaml"), strings.HasSuffix(*o.path, ".yml"):
isJSON = false
var data []byte
var err error
switch *o.path {
case "":
log.Warn("no specified config file, use default path to detect config file")
for _, file := range defaultConfigPath {
log.Warn("try to load config from default path:", file)
data, isJSON, err = detectAndReadConfig(file)
if err != nil {
log.Warn(err)
continue
}
break
}
default:
log.Fatal("unsupported filename suffix", *o.path, ". use .yaml or .json instead.")
data, isJSON, err = detectAndReadConfig(*o.path)
if err != nil {
log.Fatal(err)
}
}
log.Info("trojan-go", constant.Version, "initializing")
proxy, err := NewProxyFromConfigData(data, isJSON)
if err != nil {
log.Fatal(err)
}
err = proxy.Run()
if err != nil {
log.Fatal(err)
if data != nil {
log.Info("trojan-go", constant.Version, "initializing")
proxy, err := NewProxyFromConfigData(data, isJSON)
if err != nil {
log.Fatal(err)
}
err = proxy.Run()
if err != nil {
log.Fatal(err)
}
}
log.Fatal("no valid config")
return nil
}
@@ -57,7 +93,7 @@ func (o *Option) Priority() int {
func init() {
option.RegisterHandler(&Option{
path: flag.String("config", "config.json", "Trojan-Go config filename (.yaml/.yml/.json)"),
path: flag.String("config", "", "Trojan-Go config filename (.yaml/.yml/.json)"),
})
option.RegisterHandler(&StdinOption{
format: flag.String("stdin-format", "disabled", "Read from standard input (yaml/json)"),