Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rest Client: add slash to log line when missing between host and uri #19325

Merged
merged 1 commit into from Jul 8, 2016
Merged

Rest Client: add slash to log line when missing between host and uri #19325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.RequestLine;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.ContentType;
Expand Down Expand Up @@ -55,7 +56,7 @@ private RequestLogger() {
*/
static void logResponse(Log logger, HttpUriRequest request, HttpHost host, HttpResponse httpResponse) {
if (logger.isDebugEnabled()) {
logger.debug("request [" + request.getMethod() + " " + host + request.getRequestLine().getUri() +
logger.debug("request [" + request.getMethod() + " " + host + getUri(request.getRequestLine()) +
"] returned [" + httpResponse.getStatusLine() + "]");
}
if (tracer.isTraceEnabled()) {
Expand All @@ -81,7 +82,7 @@ static void logResponse(Log logger, HttpUriRequest request, HttpHost host, HttpR
* Logs a request that failed
*/
static void logFailedRequest(Log logger, HttpUriRequest request, HttpHost host, IOException e) {
logger.debug("request [" + request.getMethod() + " " + host + request.getRequestLine().getUri() + "] failed", e);
logger.debug("request [" + request.getMethod() + " " + host + getUri(request.getRequestLine()) + "] failed", e);
if (logger.isTraceEnabled()) {
String traceRequest;
try {
Expand All @@ -98,7 +99,7 @@ static void logFailedRequest(Log logger, HttpUriRequest request, HttpHost host,
* Creates curl output for given request
*/
static String buildTraceRequest(HttpUriRequest request, HttpHost host) throws IOException {
String requestLine = "curl -iX " + request.getMethod() + " '" + host + request.getRequestLine().getUri() + "'";
String requestLine = "curl -iX " + request.getMethod() + " '" + host + getUri(request.getRequestLine()) + "'";
if (request instanceof HttpEntityEnclosingRequest) {
HttpEntityEnclosingRequest enclosingRequest = (HttpEntityEnclosingRequest) request;
if (enclosingRequest.getEntity() != null) {
Expand Down Expand Up @@ -143,4 +144,11 @@ static String buildTraceResponse(HttpResponse httpResponse) throws IOException {
}
return responseLine;
}

private static String getUri(RequestLine requestLine) {
if (requestLine.getUri().charAt(0) != '/') {
return "/" + requestLine.getUri();
}
return requestLine.getUri();
}
}
11 changes: 9 additions & 2 deletions client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java
View file
Open in desktop
Expand Up @@ -50,7 +50,14 @@ public class RequestLoggerTests extends RestClientTestCase {

public void testTraceRequest() throws IOException, URISyntaxException {
HttpHost host = new HttpHost("localhost", 9200, getRandom().nextBoolean() ? "http" : "https");
URI uri = new URI("/index/type/_api");

String expectedEndpoint = "/index/type/_api";
URI uri;
if (randomBoolean()) {
uri = new URI(expectedEndpoint);
} else {
uri = new URI("index/type/_api");
}

HttpRequestBase request;
int requestType = RandomInts.randomIntBetween(getRandom(), 0, 7);
Expand Down Expand Up @@ -83,7 +90,7 @@ public void testTraceRequest() throws IOException, URISyntaxException {
throw new UnsupportedOperationException();
}

String expected = "curl -iX " + request.getMethod() + " '" + host + uri + "'";
String expected = "curl -iX " + request.getMethod() + " '" + host + expectedEndpoint + "'";
boolean hasBody = request instanceof HttpEntityEnclosingRequest && getRandom().nextBoolean();
String requestBody = "{ \"field\": \"value\" }";
if (hasBody) {
Expand Down