7d824a5179
- Better settings tree structure logged using `qdm12/gotree` - Read settings from environment variables, then files, then secret files - Settings methods to default them, merge them and override them - `DNS_PLAINTEXT_ADDRESS` default changed to `127.0.0.1` to use DoT. Warning added if set to something else. - `HTTPPROXY_LISTENING_ADDRESS` instead of `HTTPPROXY_PORT` (with retro-compatibility)
51 lines
1.0 KiB
Go
51 lines
1.0 KiB
Go
package openvpn
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
"github.com/qdm12/golibs/command"
|
|
)
|
|
|
|
type Runner struct {
|
|
settings settings.OpenVPN
|
|
starter command.Starter
|
|
logger Logger
|
|
}
|
|
|
|
func NewRunner(settings settings.OpenVPN, starter command.Starter,
|
|
logger 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
|
|
}
|
|
|
|
streamCtx, streamCancel := context.WithCancel(context.Background())
|
|
streamDone := make(chan struct{})
|
|
go streamLines(streamCtx, streamDone, r.logger,
|
|
stdoutLines, stderrLines, ready)
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
<-waitError
|
|
close(waitError)
|
|
streamCancel()
|
|
<-streamDone
|
|
errCh <- ctx.Err()
|
|
case err := <-waitError:
|
|
close(waitError)
|
|
streamCancel()
|
|
<-streamDone
|
|
errCh <- err
|
|
}
|
|
}
|