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

Restarts openvpn on failure without Docker restart (#144)

Browse Source
This commit is contained in:
Quentin McGaw
2020-04-28 21:22:18 -04:00
committed by GitHub
parent 352af84977
commit b0ea739c20
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/main.go
View File

@@ -256,11 +256,19 @@ func main() {
go streamMerger.Merge(stdout, command.MergeName("shadowsocks"), command.MergeColor(constants.ColorShadowsocks())) go streamMerger.Merge(stdout, command.MergeName("shadowsocks"), command.MergeColor(constants.ColorShadowsocks()))
go streamMerger.Merge(stderr, command.MergeName("shadowsocks error"), command.MergeColor(constants.ColorShadowsocksError())) go streamMerger.Merge(stderr, command.MergeName("shadowsocks error"), command.MergeColor(constants.ColorShadowsocksError()))
} }
// Runs openvpn and restarts it if it does not exit cleanly
go func() {
for {
stream, waitFn, err := ovpnConf.Start(ctx) stream, waitFn, err := ovpnConf.Start(ctx)
e.FatalOnError(err) e.FatalOnError(err)
waiter.Add(waitFn)
go streamMerger.Merge(stream, command.MergeName("openvpn"), command.MergeColor(constants.ColorOpenvpn())) go streamMerger.Merge(stream, command.MergeName("openvpn"), command.MergeColor(constants.ColorOpenvpn()))
if err := waitFn(); err != nil {
logger.Error("openvpn crashed: %s", err)
} else {
break
}
}
}()
signals.WaitForExit(func(signal string) int { signals.WaitForExit(func(signal string) int {
logger.Warn("Caught OS signal %s, shutting down", signal) logger.Warn("Caught OS signal %s, shutting down", signal)
if allSettings.VPNSP == "pia" && allSettings.PIA.PortForwarding.Enabled { if allSettings.VPNSP == "pia" && allSettings.PIA.PortForwarding.Enabled {