From 657937d272515970afacea0d322e42aa07b1386d Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 4 Jan 2021 01:46:50 +0000 Subject: [PATCH] Maintenance: Add waitgroup to collectStreamLines --- cmd/gluetun/main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index 94c79083..9c09852b 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -261,7 +261,8 @@ func _main(background context.Context, buildInfo models.BuildInformation, wg := &sync.WaitGroup{} - go collectStreamLines(ctx, streamMerger, logger, signalTunnelReady) // TODO waitgroup + wg.Add(1) + go collectStreamLines(ctx, wg, streamMerger, logger, signalTunnelReady) openvpnLooper := openvpn.NewLooper(allSettings.OpenVPN, nonRootUsername, puid, pgid, allServers, ovpnConf, firewallConf, routingConf, logger, httpClient, os.OpenFile, streamMerger, cancel) @@ -346,9 +347,10 @@ func printVersions(ctx context.Context, logger logging.Logger, } } -//nolint:lll -func collectStreamLines(ctx context.Context, streamMerger command.StreamMerger, +func collectStreamLines(ctx context.Context, wg *sync.WaitGroup, + streamMerger command.StreamMerger, logger logging.Logger, signalTunnelReady func()) { + defer wg.Done() // Blocking line merging paramsReader for openvpn and unbound logger.Info("Launching standard output merger") streamMerger.CollectLines(ctx, func(line string) {