From 38b515c5470b74099b85a4f30aef2dce65600818 Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Thu, 9 Apr 2020 02:15:56 +0300 Subject: add socket path config option, fix env find order --- cmd/tunneld/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmd/tunneld') diff --git a/cmd/tunneld/main.go b/cmd/tunneld/main.go index 4ff23ba..e56dd12 100644 --- a/cmd/tunneld/main.go +++ b/cmd/tunneld/main.go @@ -25,6 +25,7 @@ var ( forceFlag = flag.Bool("f", false, "try start with force") syslogFlag = flag.Bool("s", false, "write log to syslog instead of stdout") configFlag = flag.String("c", "", "path to configuration file") + socketFlag = flag.String("S", "", "path to control socket") ) func initLog() { @@ -69,6 +70,10 @@ func initSignals(s *server.Server) { } func getSocketPath() string { + if *socketFlag != "" { + return *socketFlag + } + s := config.GetSocketPath() if err := os.Mkdir(path.Dir(s), 0700); err != nil { @@ -83,7 +88,7 @@ func getSocketPath() string { func openConfig() (*os.File, error) { var c string - if len(*configFlag) > 0 { + if *configFlag != "" { c = *configFlag } else { c = config.GetConfigPath() -- cgit v1.2.3-70-g09d2