miracle091/dnscrypt-proxy
miracle091/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2024-12-28 00:20:13 +01:00
Code Issues Releases Wiki Activity

Revert "move ConfigLoad and InitPluginsGlobals to appMain"

Browse Source 
This reverts commit b67d19ffb3.
This commit is contained in:
Frank Denis 2019-10-31 17:36:28 +01:00
parent 393195066e
commit 828af28658
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dnscrypt-proxy/main.go
View File

@ -109,7 +109,15 @@ func main() {
} }
func (app *App) Start(service service.Service) error { func (app *App) Start(service service.Service) error {
go app.appMain() go func() {
if err := ConfigLoad(app.proxy, app.flags); err != nil {
dlog.Fatal(err)
}
if err := app.proxy.InitPluginsGlobals(); err != nil {
dlog.Fatal(err)
}
app.appMain()
}()
return nil return nil
} }
@ -123,12 +131,6 @@ func (app *App) Stop(service service.Service) error {
} }
func (app *App) appMain() { func (app *App) appMain() {
if err := ConfigLoad(app.proxy, app.flags); err != nil {
dlog.Fatal(err)
}
if err := app.proxy.InitPluginsGlobals(); err != nil {
dlog.Fatal(err)
}
pidfile.Write() pidfile.Write()
app.proxy.StartProxy() app.proxy.StartProxy()
} }