From 42d4984f2852f1a834e591dcb4a542ec7129adf2 Mon Sep 17 00:00:00 2001 From: DuckSoft Date: Tue, 14 Jul 2020 17:14:23 +0800 Subject: [PATCH] read from stdin: updated now you must use --stdin-format=yaml or --stdin-format=json to read config from stdin. --- proxy/option.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proxy/option.go b/proxy/option.go index 9ee6f84..a0fcdf4 100644 --- a/proxy/option.go +++ b/proxy/option.go @@ -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 }