Maint: minor Openvpn loop simplifications

internal/openvpn/helpers.go

@@ -4,9 +4,15 @@ import (
 	"context"
 	"time"
 
+	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/models"
 )
 
+func (l *Loop) crashed(ctx context.Context, err error) {
+	l.signalOrSetStatus(constants.Crashed)
+	l.logAndWait(ctx, err)
+}
+
 func (l *Loop) signalOrSetStatus(status models.LoopStatus) {
 	if l.userTrigger {
 		l.userTrigger = false

internal/openvpn/run.go

@@ -32,40 +32,32 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 		var err error
 		if openVPNSettings.Config == "" {
 			connection, err = providerConf.GetOpenVPNConnection(providerSettings.ServerSelection)
-			if err != nil {
+			if err == nil {
-				l.signalOrSetStatus(constants.Crashed)
+				lines = providerConf.BuildConf(connection, l.username, openVPNSettings)
-				l.logAndWait(ctx, err)
-				continue
 			}
-			lines = providerConf.BuildConf(connection, l.username, openVPNSettings)
 		} else {
 			lines, connection, err = l.processCustomConfig(openVPNSettings)
-			if err != nil {
+		}
-				l.signalOrSetStatus(constants.Crashed)
+		if err != nil {
-				l.logAndWait(ctx, err)
+			l.crashed(ctx, err)
-				continue
+			continue
-			}
 		}
 
 		if err := l.conf.WriteConfig(lines); err != nil {
-			l.signalOrSetStatus(constants.Crashed)
+			l.crashed(ctx, err)
-			l.logAndWait(ctx, err)
 			continue
 		}
 
 		if openVPNSettings.User != "" {
-			err := l.conf.WriteAuthFile(
+			err := l.conf.WriteAuthFile(openVPNSettings.User, openVPNSettings.Password)
-				openVPNSettings.User, openVPNSettings.Password)
 			if err != nil {
-				l.signalOrSetStatus(constants.Crashed)
+				l.crashed(ctx, err)
-				l.logAndWait(ctx, err)
 				continue
 			}
 		}
 
 		if err := l.fw.SetVPNConnection(ctx, connection); err != nil {
-			l.signalOrSetStatus(constants.Crashed)
+			l.crashed(ctx, err)
-			l.logAndWait(ctx, err)
 			continue
 		}
 
@@ -75,8 +67,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 			openvpnCtx, openVPNSettings.Version, openVPNSettings.Flags)
 		if err != nil {
 			openvpnCancel()
-			l.signalOrSetStatus(constants.Crashed)
+			l.crashed(ctx, err)
-			l.logAndWait(ctx, err)
 			continue
 		}