From 932f7e8b1451814606d3bb41e2b6272a937e3e82 Mon Sep 17 00:00:00 2001
From: Emile <hanemile@protonmail.com>
Date: Tue, 26 Feb 2019 14:16:25 +0100
Subject: preparing docker-swarm deployment

---
 Dockerfile   |  7 +++++++
 main.go      | 43 +++++++++++++++++++++++++++++++++++--------
 main_test.go |  2 +-
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0bef1cf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM golang:latest
+
+WORKDIR /home
+
+COPY . /home
+
+ENTRYPOINT ["go", "run", "."]
diff --git a/main.go b/main.go
index 7affe0d..6d9ac30 100644
--- a/main.go
+++ b/main.go
@@ -18,9 +18,13 @@ type point struct {
 }
 
 // make a request to the nfw api and return the result
-func netNFW(x float64, y float64, z float64) float64 {
+func netNFW(x float64, y float64, z float64) (float64, error) {
 
 	var nfwurl = os.Getenv("nfwurl")
+	if nfwurl == "" {
+		log.Println("no nfwurl given! set one using the nfwurl environment variable!")
+		return -1, nil
+	}
 
 	// build the request string
 	var randMinRequestURL string = fmt.Sprintf("http://%s/NFW?x=%f&y=%f&z=%f", nfwurl, x, y, z)
@@ -49,7 +53,7 @@ func netNFW(x float64, y float64, z float64) float64 {
 
 	result := dat["NFW"].(float64)
 
-	return result
+	return result, nil
 }
 
 func gen(galaxyRange float64) point {
@@ -61,15 +65,23 @@ func gen(galaxyRange float64) point {
 	var rangeMin float64 = -length
 	var rangeMax float64 = length
 
-	var randMin float64 = netNFW(0, 0, 0)
-	fmt.Printf("randmin: %30.20f", randMin)
-	var randMax float64 = netNFW(length, length, length)
-	fmt.Printf("randmax: %30.20f", randMax)
+	// get the minimal NFW value
+	var randMin, errGetMinValue = netNFW(0, 0, 0)
+	if errGetMinValue != nil {
+		panic(errGetMinValue)
+	}
+
+	// get the maximal NFW value
+	var randMax, errGetMaxValue = netNFW(length, length, length)
+	if errGetMaxValue != nil {
+		panic(errGetMaxValue)
+	}
 
 	var starFound bool = false
 
 	for starFound == false {
 
+		// define a new random source (without this, the numbers would not be random!)
 		randomSource := rand.New(rand.NewSource(time.Now().UnixNano()))
 
 		// generate random coordinates
@@ -77,16 +89,26 @@ func gen(galaxyRange float64) point {
 		var y float64 = ((rangeMax - rangeMin) * randomSource.Float64()) + rangeMin
 		var z float64 = ((rangeMax - rangeMin) * randomSource.Float64()) + rangeMin
 
+		// generate a random value in the (randmin, randmax) range
 		var randomValue = randomSource.Float64()
 		var randVal = ((randMax - randMin) * randomValue) + randMin
 
-		if randVal < netNFW(x, y, z) {
-			var newStar point = point{x, y, z}
+		// calculate the nfw-value of the previously generated star
+		var nfwVal, err = netNFW(x, y, z)
+		if err != nil {
+			panic(err)
+		}
 
+		// check if th star should be kept or not
+		if randVal < nfwVal {
+			var newStar point = point{x, y, z}
 			starFound = true
 			return newStar
 		}
 	}
+
+	// if no star is found at all, return (0, 0, 0)
+	// this code should actually never be reached
 	return point{0, 0, 0}
 }
 
@@ -108,8 +130,13 @@ func generate(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+	_, _ = fmt.Fprintf(w, "Generator container here!\nUse the /gen endpoint to generator a star!")
+}
+
 func main() {
 	router := mux.NewRouter()
+	router.HandleFunc("/", indexHandler).Methods("GET")
 	router.HandleFunc("/gen", generate).Methods("GET")
 	log.Fatal(http.ListenAndServe(":8123", router))
 }
diff --git a/main_test.go b/main_test.go
index b4dd362..1b5ddc7 100644
--- a/main_test.go
+++ b/main_test.go
@@ -45,7 +45,7 @@ func Test_netNFW(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := netNFW(tt.args.x, tt.args.y, tt.args.z); got != tt.want {
+			if got, _ := netNFW(tt.args.x, tt.args.y, tt.args.z); got != tt.want {
 				t.Errorf("netNFW() = %v, want %v", got, tt.want)
 			}
 		})
-- 
cgit 1.4.1