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

Using a waitgroup to wait for all programs to exit

Browse Source
This commit is contained in:
Quentin McGaw
2020-07-08 23:36:02 +00:00
parent 8669748289
commit 99e386abc8
6 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/dns/loop.go
View File

@@ -3,6 +3,7 @@ package dns
import (
"context"
"net"
"sync"
"time"
"github.com/qdm12/golibs/command"
@@ -12,7 +13,7 @@ import (
)
type Looper interface {
Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{})
Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup)
RunRestartTicker(ctx context.Context, restart chan<- struct{})
}
@@ -43,12 +44,13 @@ func (l *looper) attemptingRestart(err error) {
time.Sleep(10 * time.Second)
}
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{}) {
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup) {
wg.Add(1)
defer wg.Done()
l.fallbackToUnencryptedDNS()
select {
case <-restart:
case <-ctx.Done():
close(done)
return
}
_, unboundCancel := context.WithCancel(ctx)
@@ -59,13 +61,11 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
case <-restart:
case <-ctx.Done():
unboundCancel()
close(done)
return
}
}
if ctx.Err() == context.Canceled {
unboundCancel()
close(done)
return
}
@@ -121,7 +121,6 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
l.logger.Warn("context canceled: exiting loop")
unboundCancel()
close(waitError)
close(done)
return
case <-restart: // triggered restart
unboundCancel()

9
internal/openvpn/loop.go
View File

@@ -2,6 +2,7 @@ package openvpn
import (
"context"
"sync"
"time"
"github.com/qdm12/golibs/command"
@@ -11,7 +12,7 @@ import (
)
type Looper interface {
Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{})
Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup)
}
type looper struct {
@@ -37,11 +38,12 @@ func NewLooper(conf Configurator, settings settings.OpenVPN, logger logging.Logg
}
}
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{}) {
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup) {
wg.Add(1)
defer wg.Done()
select {
case <-restart:
case <-ctx.Done():
close(done)
return
}
for {
@@ -69,7 +71,6 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
l.logger.Warn("context canceled: exiting loop")
openvpnCancel()
close(waitError)
close(done)
return
case <-restart: // triggered restart
l.logger.Info("restarting")

8
internal/server/server.go
View File

@@ -4,13 +4,14 @@ import (
"context"
"fmt"
"net/http"
"sync"
"time"
"github.com/qdm12/golibs/logging"
)
type Server interface {
Run(ctx context.Context, serverDone chan struct{})
Run(ctx context.Context, wg *sync.WaitGroup)
}
type server struct {
@@ -29,10 +30,11 @@ func New(address string, logger logging.Logger, restartOpenvpn, restartUnbound c
}
}
func (s *server) Run(ctx context.Context, serverDone chan struct{}) {
func (s *server) Run(ctx context.Context, wg *sync.WaitGroup) {
wg.Add(1)
server := http.Server{Addr: s.address, Handler: s.makeHandler()}
go func() {
defer close(serverDone)
defer wg.Done()
<-ctx.Done()
s.logger.Warn("context canceled: exiting loop")
shutdownCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)

9
internal/shadowsocks/loop.go
View File

@@ -2,6 +2,7 @@ package shadowsocks
import (
"context"
"sync"
"time"
"github.com/qdm12/golibs/command"
@@ -12,7 +13,7 @@ import (
)
type Looper interface {
Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{})
Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup)
}
type looper struct {
@@ -46,11 +47,12 @@ func NewLooper(conf Configurator, firewallConf firewall.Configurator, settings s
}
}
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{}) {
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup) {
wg.Add(1)
defer wg.Done()
select {
case <-restart:
case <-ctx.Done():
close(done)
return
}
for {
@@ -97,7 +99,6 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
l.logger.Warn("context canceled: exiting loop")
shadowsocksCancel()
close(waitError)
close(done)
return
case <-restart: // triggered restart
l.logger.Info("restarting")

9
internal/tinyproxy/loop.go
View File

@@ -2,6 +2,7 @@ package tinyproxy
import (
"context"
"sync"
"time"
"github.com/qdm12/golibs/command"
@@ -12,7 +13,7 @@ import (
)
type Looper interface {
Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{})
Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup)
}
type looper struct {
@@ -44,11 +45,12 @@ func NewLooper(conf Configurator, firewallConf firewall.Configurator, settings s
}
}
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- struct{}) {
func (l *looper) Run(ctx context.Context, restart <-chan struct{}, wg *sync.WaitGroup) {
wg.Add(1)
defer wg.Done()
select {
case <-restart:
case <-ctx.Done():
close(done)
return
}
for {
@@ -89,7 +91,6 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, done chan<- s
l.logger.Warn("context canceled: exiting loop")
tinyproxyCancel()
close(waitError)
close(done)
return
case <-restart: // triggered restart
l.logger.Info("restarting")