added better errorhandling (replaced bad switch-statement)

pkg/funcs.go

@@ -10,7 +10,7 @@ import (
 
 // creates http client for ensuring timely timeouts
 var client = http.Client{
-	Timeout:       15 * time.Second,
+	Timeout:       10 * time.Second,
 }
 
 // allowing access to "overloaded" functions
@@ -58,7 +58,7 @@ func getBody(url string, m mashup) error {
 
 	// sends appropriate error
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%d", resp.StatusCode)
+		return fmt.Errorf("bad status code: %d", resp.StatusCode)
 	}
 
 	// all went well
@@ -70,17 +70,17 @@ func HttpError(w http.ResponseWriter, err error) {
 
 	// if timeout happened
 	if strings.Contains(err.Error(), "Client.Timeout exceeded") {
-		http.Error(w, "Request timeout", http.StatusGatewayTimeout)
+		http.Error(w, "Request to API timed out", http.StatusGatewayTimeout)
 		return // return if error is already displayed
 	}
 
-	switch err.Error() {
-	case "400":
-		http.Error(w, "Bad Request: " + err.Error(), http.StatusBadRequest)
-	case "404":
-		http.Error(w, "Not found: " + err.Error(), http.StatusNotFound)
-	default:
-		http.Error(w, "Error occurred", http.StatusInternalServerError)
+	// if a custom error was sent (caused by api response code)
+	if strings.Contains(err.Error(), "bad status code:") {
+		http.Error(w, "Request to API timed out", http.StatusGatewayTimeout)
+		return // return if error is already displayed
 	}
 
+	// Default response in case of decoding errors or other errors
+	http.Error(w, "Internal server error", http.StatusInternalServerError)
+
 }