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

Merge pull request #140 from DuckSoft/dev

Browse Source 
read from stdin: updated
This commit is contained in:
Page Fault
2020-07-14 13:28:03 +00:00
committed by GitHub
parent b93210ce01 42d4984f28
commit 2dc02c25e7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/option.go
+4 -1
View File
@@ -57,7 +57,7 @@ func init() {
path: flag.String("config", "config.json", "Trojan-Go config filename (.yaml/.yml/.json)"),
})
option.RegisterHandler(&StdinOption{
format: flag.String("stdin-format", "yaml", "Read from standard input (yaml/json)"),
format: flag.String("stdin-format", "disabled", "Read from standard input (yaml/json)"),
suppressHint: flag.Bool("stdin-suppress-hint", false, "Suppress hint text"),
})
}
@@ -111,5 +111,8 @@ func (o *StdinOption) isFormatJson() (isJson bool, e error) {
if o.format == nil {
return false, common.NewError("format specifier is nil")
}
if *o.format == "disabled" {
return false, common.NewError("reading from stdin is disabled")
}
return strings.ToLower(*o.format) == "json", nil
}