Clean up dialer logic

bdwyertech · Mar 5, 2021 · 55b6755 · 55b6755
1 parent 83a6004
commit 55b6755
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/pkg/gontlm-proxy.go b/pkg/gontlm-proxy.go
@@ -78,18 +78,18 @@ func Run() {
 	//
 	// Proxy Dialer
 	//
-	dialer := func(network, addr string) (net.Conn, error) {
+	proxy.Tr.DialContext = proxyplease.NewDialContext(proxyplease.Proxy{
+		URL:      proxyUrl,
+		Username: ProxyUser,
+		Password: ProxyPass,
+		Domain:   ProxyDomain,
+	})
+	proxy.ConnectDial = func(network, addr string) (net.Conn, error) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		return proxyplease.NewDialContext(proxyplease.Proxy{
-			URL:      proxyUrl,
-			Username: ProxyUser,
-			Password: ProxyPass,
-			Domain:   ProxyDomain,
-		})(ctx, network, addr)
+		return proxy.Tr.DialContext(ctx, network, addr)
 	}
-	proxy.ConnectDial = dialer
-	proxy.Tr.Dial = dialer
+
 	proxy.Tr.Proxy = nil
 
 	//