Maint: create OpenVPN runner in VPN run loop

internal/openvpn/openvpn.go

@@ -11,7 +11,6 @@ var _ Interface = (*Configurator)(nil)
 type Interface interface {
 	VersionGetter
 	AuthWriter
-	Runner
 	Writer
 }
 

internal/openvpn/run.go

@@ -4,17 +4,27 @@ import (
 	"context"
 
 	"github.com/qdm12/gluetun/internal/configuration"
+	"github.com/qdm12/golibs/command"
 	"github.com/qdm12/golibs/logging"
 )
 
-type Runner interface {
-	Run(ctx context.Context, errCh chan<- error, ready chan<- struct{},
-		logger logging.Logger, settings configuration.OpenVPN)
+type Runner struct {
+	settings configuration.OpenVPN
+	starter  command.Starter
+	logger   logging.Logger
 }
 
-func (c *Configurator) Run(ctx context.Context, errCh chan<- error,
-	ready chan<- struct{}, logger logging.Logger, settings configuration.OpenVPN) {
-	stdoutLines, stderrLines, waitError, err := c.start(ctx, settings.Version, settings.Flags)
+func NewRunner(settings configuration.OpenVPN, starter command.Starter,
+	logger logging.Logger) *Runner {
+	return &Runner{
+		starter:  starter,
+		logger:   logger,
+		settings: settings,
+	}
+}
+
+func (r *Runner) Run(ctx context.Context, errCh chan<- error, ready chan<- struct{}) {
+	stdoutLines, stderrLines, waitError, err := start(ctx, r.starter, r.settings.Version, r.settings.Flags)
 	if err != nil {
 		errCh <- err
 		return
@@ -22,7 +32,7 @@ func (c *Configurator) Run(ctx context.Context, errCh chan<- error,
 
 	streamCtx, streamCancel := context.WithCancel(context.Background())
 	streamDone := make(chan struct{})
-	go streamLines(streamCtx, streamDone, logger,
+	go streamLines(streamCtx, streamDone, r.logger,
 		stdoutLines, stderrLines, ready)
 
 	select {

internal/openvpn/start.go

@@ -8,6 +8,7 @@ import (
 	"syscall"
 
 	"github.com/qdm12/gluetun/internal/constants"
+	"github.com/qdm12/golibs/command"
 )
 
 var ErrVersionUnknown = errors.New("OpenVPN version is unknown")
@@ -17,7 +18,7 @@ const (
 	binOpenvpn25 = "openvpn"
 )
 
-func (c *Configurator) start(ctx context.Context, version string, flags []string) (
+func start(ctx context.Context, starter command.Starter, version string, flags []string) (
 	stdoutLines, stderrLines chan string, waitError chan error, err error) {
 	var bin string
 	switch version {
@@ -29,12 +30,10 @@ func (c *Configurator) start(ctx context.Context, version string, flags []string
 		return nil, nil, nil, fmt.Errorf("%w: %s", ErrVersionUnknown, version)
 	}
 
-	c.logger.Info("starting OpenVPN " + version)
-
 	args := []string{"--config", constants.OpenVPNConf}
 	args = append(args, flags...)
 	cmd := exec.CommandContext(ctx, bin, args...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
-	return c.cmder.Start(cmd)
+	return starter.Start(cmd)
 }