Merge remote-tracking branch 'origin/master'

vfarcic · vfarcic · commit 6033cd2e12ae · 2016-12-11T18:44:16.000+01:00
diff --git a/server/server.go b/server/server.go
@@ -40,7 +40,7 @@ func (m *Serve) SendDistributeRequests(req *http.Request, port, proxyServiceName
 			}
 		}
 	} else {
-		return http.StatusBadRequest, fmt.Errorf("Could not perform DNS %s lookup", dns)
+		return http.StatusBadRequest, fmt.Errorf("Could not perform DNS %s lookup. If the proxy is not called 'proxy', you must set SERVICE_NAME=<name-of-the-proxy>.", dns)
 	}
 	if len(failedDns) > 0 {
 		return http.StatusBadRequest, fmt.Errorf("Could not send distribute request to the following addresses: %s", failedDns)

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (m Serve) SendDistributeRequests(req http.Request, port, proxyServiceName`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`} else {`
`43`		`- return http.StatusBadRequest, fmt.Errorf("Could not perform DNS %s lookup", dns)`
	`43`	`+ return http.StatusBadRequest, fmt.Errorf("Could not perform DNS %s lookup. If the proxy is not called 'proxy', you must set SERVICE_NAME=<name-of-the-proxy>.", dns)`
`44`	`44`	`}`
`45`	`45`	`if len(failedDns) > 0 {`
`46`	`46`	`return http.StatusBadRequest, fmt.Errorf("Could not send distribute request to the following addresses: %s", failedDns)`