From e7f4071c4bea0406773cb6bfa6501ba4a3a94501 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 3 Mar 2019 03:25:43 +0100 Subject: tunnel: simplify shutdown --- service/install.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'service/install.go') diff --git a/service/install.go b/service/install.go index 95a419de..bb2fb046 100644 --- a/service/install.go +++ b/service/install.go @@ -9,7 +9,6 @@ import ( "errors" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" - svcdbg "golang.org/x/sys/windows/svc/debug" "golang.org/x/sys/windows/svc/mgr" "golang.zx2c4.com/wireguard/windows/conf" "os" @@ -184,14 +183,10 @@ func UninstallTunnel(name string) error { return err2 } -func RunTunnel(confPath string, debug bool) error { +func RunTunnel(confPath string) error { name, err := conf.NameFromPath(confPath) if err != nil { return err } - if debug { - return svcdbg.Run("WireGuard Tunnel: "+name, &tunnelService{confPath, true}) - } else { - return svc.Run("WireGuard Tunnel: "+name, &tunnelService{confPath, false}) - } + return svc.Run("WireGuard Tunnel: "+name, &tunnelService{confPath}) } -- cgit v1.2.3-59-g8ed1b