admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wait for openvpn to exit on program termination

Browse Source
This commit is contained in:
Quentin McGaw
2020-04-30 11:01:22 +00:00
parent d864a9f580
commit ac706bd156
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/main.go
View File

@@ -259,11 +259,16 @@ func main() {
} }
// Runs openvpn and restarts it if it does not exit cleanly // Runs openvpn and restarts it if it does not exit cleanly
go func() { go func() {
waitErrors := make(chan error)
for { for {
stream, waitFn, err := ovpnConf.Start(ctx) stream, waitFn, err := ovpnConf.Start(ctx)
e.FatalOnError(err) e.FatalOnError(err)
go streamMerger.Merge(ctx, stream, command.MergeName("openvpn"), command.MergeColor(constants.ColorOpenvpn())) go streamMerger.Merge(ctx, stream, command.MergeName("openvpn"), command.MergeColor(constants.ColorOpenvpn()))
waiter.Add(func() error {
return <-waitErrors
})
if err := waitFn(); err != nil { if err := waitFn(); err != nil {
waitErrors <- err
logger.Error("openvpn crashed: %s", err) logger.Error("openvpn crashed: %s", err)
} else { } else {
break break