[WIP] Issue36 - Eureka integration

discovery/eureka.go

@@ -3,20 +3,31 @@ package discovery
 import (
 	"errors"
 	"net/http"
+	"io/ioutil"
+	"fmt"
+	"time"
+	"net"
 )
 
 //TODO: This should become a discovery interface. And Eureka just the first implementation
 type EurekaClient struct {
 	eurekaUrl string
 }
 
+//TODO: Creating our own error type and wrapping standard net/http errors could be useful to prevent
+// the original errors from being lost
+var errEurekaTimesOut = errors.New("Eureka server timed out")
 var errNoEurekaConnection = errors.New("Unable to reach Eureka server")
 var errEurekaUnexpectedHttpResponseCode = errors.New("Eureka returned a non 200 http response code")
+const eurekaClientTimeoutInSeconds  = 10
 
 func NewEurekaClient(eurekaUrl string) (ec EurekaClient, err error) {
 	ec.eurekaUrl = eurekaUrl
-	resp, err := http.Get(eurekaUrl)
-	if err != nil {
+	httpclient := http.Client{Timeout: time.Second * eurekaClientTimeoutInSeconds}
+	resp, err := httpclient.Get(eurekaUrl)
+	if serr, ok := err.(net.Error); ok && serr.Timeout()  {
+		return ec,errEurekaTimesOut
+	} else if err != nil {
 		return ec, errNoEurekaConnection
 	}
 	defer resp.Body.Close()
@@ -30,8 +41,12 @@ var errNoIpsFound = errors.New("No IPs associated to the requested App name")
 
 func (ec EurekaClient) GetIPs(appName string) ([]string, error) {
 	eurekaAppUrl := ec.eurekaUrl + "/v2/apps/" + appName
-	resp, err := http.Get(eurekaAppUrl)
-	if err != nil {
+	//resp, err := http.Get(eurekaAppUrl, "application/json; charset=utf-8")
+	httpclient := http.Client{Timeout: time.Second * eurekaClientTimeoutInSeconds}
+	resp, err := httpclient.Get(eurekaAppUrl)
+	if serr, ok := err.(net.Error); ok && serr.Timeout()  {
+		return []string{},errEurekaTimesOut
+	} else if err != nil {
 		return []string{}, errNoEurekaConnection
 	}
 	defer resp.Body.Close()
@@ -40,5 +55,7 @@ func (ec EurekaClient) GetIPs(appName string) ([]string, error) {
 	} else if resp.StatusCode != 200 {
 		return []string{},errEurekaUnexpectedHttpResponseCode
 	}
+	body, err := ioutil.ReadAll(resp.Body)
+	fmt.Println(string(body))
 	return nil, nil
 }

discovery/eureka_test.go

@@ -53,7 +53,14 @@ func TestMain(m *testing.M) {
 func TestEurekaClientNoEureka(t *testing.T) {
 	_, err := NewEurekaClient("http://localhost:9999/thisshouldntwork")
 	if err != errNoEurekaConnection {
-		t.Fatal("We shouldnt reach eureka if Eureka hostname/port is completely wrong")
+		t.Fatal("We shouldnt reach eureka if Eureka hostname/port is completely wrong. Actual err:", err)
+	}
+}
+
+func TestEurekaClientEurekaDoesNotReply(t *testing.T) {
+	_, err := NewEurekaClient("http://192.0.2.1:9999/thisshouldtimeout")
+	if err != errEurekaTimesOut {
+		t.Fatal("Pointing to a destination that drops packages should fail because of timeout. Actual err:", err)
 	}
 }