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

Remove unneeded waiter object

Browse Source
This commit is contained in:
Quentin McGaw
2020-07-08 23:43:03 +00:00
parent 3d25db1bed
commit 5bf471767d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/gluetun/main.go
View File

@@ -129,8 +129,6 @@ func _main(background context.Context, args []string) int {
defer close(connectedCh) defer close(connectedCh)
go collectStreamLines(ctx, streamMerger, logger, signalConnected) go collectStreamLines(ctx, streamMerger, logger, signalConnected)
waiter := command.NewWaiter()
connections, err := providerConf.GetOpenVPNConnections(allSettings.OpenVPN.Provider.ServerSelection) connections, err := providerConf.GetOpenVPNConnections(allSettings.OpenVPN.Provider.ServerSelection)
fatalOnError(err) fatalOnError(err)
err = providerConf.BuildConf( err = providerConf.BuildConf(
@@ -247,12 +245,6 @@ func _main(background context.Context, args []string) int {
exitStatus = 1 exitStatus = 1
} }
} }
timeoutCtx, timeoutCancel := context.WithTimeout(background, time.Second)
defer timeoutCancel()
for _, err := range waiter.WaitForAll(timeoutCtx) {
logger.Error(err)
exitStatus = 1
}
wg.Wait() wg.Wait()
return exitStatus return exitStatus
} }