admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FatalOnError cancels parent context

Browse Source
This commit is contained in:
Quentin McGaw
2020-05-02 13:05:09 +00:00
parent 41168f88cd
commit 8e77842f1e
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/main.go
View File

@@ -49,7 +49,11 @@ func main() { //nolint:gocognit
}
paramsReader := params.NewReader(logger)
fmt.Println(splash.Splash(paramsReader))
e := env.New(logger)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
e := env.New(logger, cancel)
client := network.NewClient(15 * time.Second)
// Create configurators
fileManager := files.NewFileManager()
@@ -63,8 +67,6 @@ func main() { //nolint:gocognit
windscribeConf := windscribe.NewConfigurator(fileManager)
tinyProxyConf := tinyproxy.NewConfigurator(fileManager, logger)
shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
streamMerger := command.NewStreamMerger()
e.PrintVersion(ctx, "OpenVPN", ovpnConf.Version)