From 1f44e7548ddea85fc13fcb0b1001cea1354eb05c Mon Sep 17 00:00:00 2001
From: Vladislav Yarmak <vladislav-ex-src@vm-0.com>
Date: Tue, 23 Mar 2021 23:58:28 +0200
Subject: [PATCH] use proxy stack for list modes

---
 main.go | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/main.go b/main.go
index 13f9119..5155705 100644
--- a/main.go
+++ b/main.go
@@ -101,13 +101,6 @@ func run() int {
 		return 0
 	}
 
-	if args.list_countries {
-		return print_countries(args.timeout)
-	}
-	if args.list_proxies {
-		return print_proxies(args.country, args.proxy_type, args.limit, args.timeout)
-	}
-
 	logWriter := NewLogWriter(os.Stderr)
 	defer logWriter.Close()
 
@@ -120,13 +113,6 @@ func run() int {
 	proxyLogger := NewCondLogger(log.New(logWriter, "PROXY   : ",
 		log.LstdFlags|log.Lshortfile),
 		args.verbosity)
-	mainLogger.Info("hola-proxy client version %s is starting...", version)
-	mainLogger.Info("Constructing fallback DNS upstream...")
-	resolver, err := NewResolver(args.resolver, args.timeout)
-	if err != nil {
-		mainLogger.Critical("Unable to instantiate DNS resolver: %v", err)
-		return 6
-	}
 
 	var dialer ContextDialer = &net.Dialer{
 		Timeout:   30 * time.Second,
@@ -149,6 +135,21 @@ func run() int {
 		UpdateHolaDialer(dialer)
 	}
 
+	if args.list_countries {
+		return print_countries(args.timeout)
+	}
+	if args.list_proxies {
+		return print_proxies(args.country, args.proxy_type, args.limit, args.timeout)
+	}
+
+	mainLogger.Info("hola-proxy client version %s is starting...", version)
+	mainLogger.Info("Constructing fallback DNS upstream...")
+	resolver, err := NewResolver(args.resolver, args.timeout)
+	if err != nil {
+		mainLogger.Critical("Unable to instantiate DNS resolver: %v", err)
+		return 6
+	}
+
 	mainLogger.Info("Initializing configuration provider...")
 	auth, tunnels, err := CredService(args.rotate, args.timeout, args.country, args.proxy_type, credLogger)
 	if err != nil {