now the HTTP server is not started if HTTPS is used. Abstract a little the implementation, and remove useless print since r.Run is blocking

Author: umbynos

info.go

@@ -31,9 +31,9 @@ func infoHandler(c *gin.Context) {
 	c.JSON(200, gin.H{
 		"version":    version,
 		"http":       "http://" + host + port,
-		"https":      "https://localhost" + portSSL,
+		"https":      "https://localhost" + port,
 		"ws":         "ws://" + host + port,
-		"wss":        "wss://localhost" + portSSL,
+		"wss":        "wss://localhost" + port,
 		"origins":    origins,
 		"update_url": updateURL,
 		"os":         runtime.GOOS + ":" + runtime.GOARCH,

main.go

@@ -48,7 +48,7 @@ var (
 	version               = "x.x.x-dev" //don't modify it, Jenkins will take care
 	commit                = "xxxxxxxx"  //don't modify it, Jenkins will take care
 	port                  string
-	portSSL               string
+	https                 = true
 	requiredToolsAPILevel = "v1"
 )
 
@@ -144,6 +144,9 @@ func main() {
 		Hibernate: *hibernate,
 		Version:   version + "-" + commit,
 		DebugURL: func() string {
+			if https {
+				return "https://" + *address + port
+			}
 			return "http://" + *address + port
 		},
 		AdditionalConfig: *additionalConfig,
@@ -196,7 +199,7 @@ func loop() {
 	log.SetLevel(log.InfoLevel)
 	log.SetOutput(os.Stdout)
 
-	// the important forlders of the agent
+	// the important folders of the agent
 	src, _ := os.Executable()
 	srcPath := paths.New(src)  // The path of the agent's binary
 	srcDir := srcPath.Parent() // The directory of the agent's binary
@@ -420,45 +423,32 @@ func loop() {
 	goa := v2.Server(agentDir.String())
 	r.Any("/v2/*path", gin.WrapH(goa))
 
-	go func() {
-		// check if certificates exist; if not, use plain http
-		if srcDir.Join("cert.pem").NotExist() {
-			log.Error("Could not find HTTPS certificate. Using plain HTTP only.")
-			return
-		}
+	// check if certificates exist; if not, use plain http
+	if srcDir.Join("cert.pem").NotExist() {
+		log.Error("Could not find HTTPS certificate. Using plain HTTP only.")
+		https = false
+	}
+	go startServer(r, https, srcDir)
+}
 
-		start := 8990
-		end := 9000
-		i := start
-		for i < end {
-			i = i + 1
-			portSSL = ":" + strconv.Itoa(i)
-			if err := r.RunTLS(*address+portSSL, srcDir.Join("cert.pem").String(), srcDir.Join("key.pem").String()); err != nil {
-				log.Printf("Error trying to bind to port: %v, so exiting...", err)
-				continue
-			} else {
-				log.Print("Starting server and websocket (SSL) on " + *address + "" + port)
-				break
-			}
+func startServer(r *gin.Engine, https bool, certDir *paths.Path) {
+	start := 8990
+	end := 9000
+	i := start
+	for i < end {
+		i = i + 1
+		port = ":" + strconv.Itoa(i)
+		var err error
+		if https {
+			err = r.RunTLS(*address+port, certDir.Join("cert.pem").String(), certDir.Join("key.pem").String())
+		} else {
+			err = r.Run(*address + port)
 		}
-	}()
-
-	go func() {
-		start := 8990
-		end := 9000
-		i := start
-		for i < end {
-			i = i + 1
-			port = ":" + strconv.Itoa(i)
-			if err := r.Run(*address + port); err != nil {
-				log.Printf("Error trying to bind to port: %v, so exiting...", err)
-				continue
-			} else {
-				log.Print("Starting server and websocket on " + *address + "" + port)
-				break
-			}
+		if err != nil {
+			log.Printf("Error trying to bind to port: %v, so exiting...", err)
+			continue
 		}
-	}()
+	}
 }
 
 func parseIni(filename string) (args []string, err error) {