Fatal container exit if openvpn or unbound exits

internal/dns/command.go

@@ -8,15 +8,15 @@ import (
 	"github.com/qdm12/private-internet-access-docker/internal/constants"
 )
 
-func (c *configurator) Start(verbosityDetailsLevel uint8) (stdout io.ReadCloser, err error) {
+func (c *configurator) Start(verbosityDetailsLevel uint8) (stdout io.ReadCloser, waitFn func() error, err error) {
 	c.logger.Info("%s: starting unbound", logPrefix)
 	args := []string{"-d", "-c", string(constants.UnboundConf)}
 	if verbosityDetailsLevel > 0 {
 		args = append(args, "-"+strings.Repeat("v", int(verbosityDetailsLevel)))
 	}
 	// Only logs to stderr
-	_, stdout, _, err = c.commander.Start("unbound", args...)
-	return stdout, err
+	_, stdout, waitFn, err = c.commander.Start("unbound", args...)
+	return stdout, waitFn, err
 }
 
 func (c *configurator) Version() (version string, err error) {

internal/dns/command_test.go

@@ -20,8 +20,9 @@ func Test_Start(t *testing.T) {
 	commander.On("Start", "unbound", "-d", "-c", string(constants.UnboundConf), "-vv").
 		Return(nil, nil, nil, nil).Once()
 	c := &configurator{commander: commander, logger: logger}
-	stdout, err := c.Start(2)
+	stdout, waitFn, err := c.Start(2)
 	assert.Nil(t, stdout)
+	assert.Nil(t, waitFn)
 	assert.NoError(t, err)
 	logger.AssertExpectations(t)
 	commander.AssertExpectations(t)

internal/dns/dns.go

@@ -19,7 +19,7 @@ type Configurator interface {
 	MakeUnboundConf(settings settings.DNS, uid, gid int) (err error)
 	UseDNSInternally(IP net.IP)
 	UseDNSSystemWide(IP net.IP) error
-	Start(logLevel uint8) (stdout io.ReadCloser, err error)
+	Start(logLevel uint8) (stdout io.ReadCloser, waitFn func() error, err error)
 	WaitForUnbound() (err error)
 	Version() (version string, err error)
 }