mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-05 06:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "refactoring of pull 980"

Browse source 
This reverts commit 6fa420a8e0.
This commit is contained in:
Frank Denis 2019-10-31 17:36:59 +01:00
parent 7636a78d74
commit fb1fc14317
5 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dnscrypt-proxy/main.go
View file

@ -8,6 +8,7 @@ import (
"math/rand"
"os"
"os/signal"
"sync"
"github.com/facebookgo/pidfile"
"github.com/jedisct1/dlog"
@ -20,6 +21,8 @@ const (
)
type App struct {
wg sync.WaitGroup
quit chan struct{}
proxy *Proxy
flags *ConfigFlags
}
@ -67,6 +70,7 @@ func main() {
}
app := &App{
quit: make(chan struct{}),
flags: &flags,
}
svc, err := service.New(app, svcConfig)
@ -96,6 +100,7 @@ func main() {
}
return
}
app.wg.Add(1)
if svc != nil {
if err = svc.Run(); err != nil {
dlog.Fatal(err)
@ -107,7 +112,7 @@ func main() {
app.signalWatch()
app.Start(nil)
}
app.proxy.ConnCloseWait()
app.wg.Wait()
dlog.Notice("Stopped.")
}
@ -129,13 +134,14 @@ func (app *App) Stop(service service.Service) error {
os.Remove(pidFilePath)
}
dlog.Notice("Quit signal received...")
app.proxy.Stop()
close(app.quit)
return nil
}
func (app *App) appMain() {
pidfile.Write()
app.proxy.StartProxy()
app.proxy.StartProxy(app.quit)
app.wg.Done()
}
func (app *App) signalWatch() {
@ -144,6 +150,6 @@ func (app *App) signalWatch() {
go func() {
<-quit
signal.Stop(quit)
app.proxy.Stop()
close(app.quit)
}()
}