From c5c53a2ff87a3160e1044a8b4b14803b69cbd56c Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Thu, 23 Jul 2020 02:15:37 +0000
Subject: [PATCH] FatalOnError fixes

---
 cmd/gluetun/main.go      | 15 +++++----------
 internal/openvpn/loop.go | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index e080bddb..d6b2ab53 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -57,8 +57,8 @@ func _main(background context.Context, args []string) int {
 	ctx, cancel := context.WithCancel(background)
 	defer cancel()
 	logger := createLogger()
-	wg := &sync.WaitGroup{}
-	fatalOnError := makeFatalOnError(logger, cancel, wg)
+
+	fatalOnError := makeFatalOnError(logger, cancel)
 
 	client := network.NewClient(15 * time.Second)
 	// Create configurators
@@ -143,6 +143,8 @@ func _main(background context.Context, args []string) int {
 		fatalOnError(err)
 	}
 
+	wg := &sync.WaitGroup{}
+
 	openvpnLooper := openvpn.NewLooper(allSettings.VPNSP, allSettings.OpenVPN, uid, gid,
 		ovpnConf, firewallConf, logger, client, fileManager, streamMerger, fatalOnError)
 	restartOpenvpn := openvpnLooper.Restart
@@ -249,18 +251,11 @@ func _main(background context.Context, args []string) int {
 	return 0
 }
 
-func makeFatalOnError(logger logging.Logger, cancel context.CancelFunc, wg *sync.WaitGroup) func(err error) {
+func makeFatalOnError(logger logging.Logger, cancel context.CancelFunc) func(err error) {
 	return func(err error) {
 		if err != nil {
 			logger.Error(err)
 			cancel()
-			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-			go func() {
-				wg.Wait()
-				cancel()
-			}()
-			<-ctx.Done() // either timeout or wait group completed
-			os.Exit(1)
 		}
 	}
 }
diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go
index 41ac35c3..1f672d1d 100644
--- a/internal/openvpn/loop.go
+++ b/internal/openvpn/loop.go
@@ -101,7 +101,10 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
 		settings := l.GetSettings()
 		providerConf := provider.New(l.provider)
 		connections, err := providerConf.GetOpenVPNConnections(settings.Provider.ServerSelection)
-		l.fatalOnError(err)
+		if err != nil {
+			l.fatalOnError(err)
+			return
+		}
 		lines := providerConf.BuildConf(
 			connections,
 			settings.Verbosity,
@@ -112,14 +115,19 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
 			settings.Auth,
 			settings.Provider.ExtraConfigOptions,
 		)
-		err = l.fileManager.WriteLinesToFile(string(constants.OpenVPNConf), lines, files.Ownership(l.uid, l.gid), files.Permissions(0400))
-		l.fatalOnError(err)
+		if err := l.fileManager.WriteLinesToFile(string(constants.OpenVPNConf), lines, files.Ownership(l.uid, l.gid), files.Permissions(0400)); err != nil {
+			l.fatalOnError(err)
+			return
+		}
 
-		err = l.conf.WriteAuthFile(settings.User, settings.Password, l.uid, l.gid)
-		l.fatalOnError(err)
+		if err := l.conf.WriteAuthFile(settings.User, settings.Password, l.uid, l.gid); err != nil {
+			l.fatalOnError(err)
+			return
+		}
 
 		if err := l.fw.SetVPNConnections(ctx, connections); err != nil {
 			l.fatalOnError(err)
+			return
 		}
 
 		openvpnCtx, openvpnCancel := context.WithCancel(context.Background())