createProxy() returns a proxy without stopping to listen

iann0036 · Apr 9, 2021 · 6de72a8 · 6de72a8
1 parent 7d2e208
commit 6de72a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net/http"
 	"os"
 	"os/exec"
 	"runtime/pprof"
@@ -151,7 +152,8 @@ func main() {
 		handleLoggedCall()
 	} else if *modeFlag == "proxy" {
 		readServiceFiles()
-		createProxy(*bindAddrFlag)
+		proxy := createProxy()
+		log.Fatal(http.ListenAndServe(*bindAddrFlag, proxy))
 	} else {
 		fmt.Println("ERROR: unknown mode")
 	}

diff --git a/proxy.go b/proxy.go
@@ -146,7 +146,7 @@ func loadCAKeys() error {
 
 var awsHostnameRegexp = regexp.MustCompile(`^.*\.amazonaws\.com(?:\.cn)?$`)
 
-func createProxy(addr string) {
+func createProxy() *goproxy.ProxyHttpServer {
 	err := loadCAKeys()
 	if err != nil {
 		log.Fatal(err)
@@ -170,7 +170,8 @@ func createProxy(addr string) {
 
 		return resp
 	})
-	log.Fatal(http.ListenAndServe(addr, proxy))
+
+	return proxy
 }
 
 type ServiceDefinition struct {