honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename RequestLogger#log methods to distinguish between the two

Browse Source 
One method is to log a request that yielded a response, the other one for a failed request
This commit is contained in:
javanna 2016-06-14 13:45:38 +02:00 committed by Luca Cavanna
parent caa6c96259
commit 1932f6bc7c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/org/elasticsearch/client/RequestLogger.java
View File

@ -53,7 +53,7 @@ final class RequestLogger {
/** /**
* Logs a request that yielded a response * Logs a request that yielded a response
*/ */
static void log(Log logger, String message, HttpUriRequest request, HttpHost host, HttpResponse httpResponse) { static void logResponse(Log logger, String message, HttpUriRequest request, HttpHost host, HttpResponse httpResponse) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(message + " [" + request.getMethod() + " " + host + request.getRequestLine().getUri() + logger.debug(message + " [" + request.getMethod() + " " + host + request.getRequestLine().getUri() +
"] [" + httpResponse.getStatusLine() + "]"); "] [" + httpResponse.getStatusLine() + "]");
@ -81,7 +81,7 @@ final class RequestLogger {
/** /**
* Logs a request that failed * Logs a request that failed
*/ */
static void log(Log logger, String message, HttpUriRequest request, HttpHost host, IOException e) { static void logFailedRequest(Log logger, String message, HttpUriRequest request, HttpHost host, IOException e) {
logger.debug(message + " [" + request.getMethod() + " " + host + request.getRequestLine().getUri() + "]", e); logger.debug(message + " [" + request.getMethod() + " " + host + request.getRequestLine().getUri() + "]", e);
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
String traceRequest; String traceRequest;

6
client/src/main/java/org/elasticsearch/client/RestClient.java
View File

@ -160,7 +160,7 @@ public final class RestClient implements Closeable {
try { try {
httpResponse = client.execute(host, request); httpResponse = client.execute(host, request);
} catch(IOException e) { } catch(IOException e) {
RequestLogger.log(logger, "request failed", request, host, e); RequestLogger.logFailedRequest(logger, "request failed", request, host, e);
onFailure(host); onFailure(host);
lastSeenException = addSuppressedException(lastSeenException, e); lastSeenException = addSuppressedException(lastSeenException, e);
continue; continue;
@ -168,11 +168,11 @@ public final class RestClient implements Closeable {
Response response = new Response(request.getRequestLine(), host, httpResponse); Response response = new Response(request.getRequestLine(), host, httpResponse);
int statusCode = response.getStatusLine().getStatusCode(); int statusCode = response.getStatusLine().getStatusCode();
if (statusCode < 300 || (request.getMethod().equals(HttpHead.METHOD_NAME) && statusCode == 404) ) { if (statusCode < 300 || (request.getMethod().equals(HttpHead.METHOD_NAME) && statusCode == 404) ) {
RequestLogger.log(logger, "request succeeded", request, host, httpResponse); RequestLogger.logResponse(logger, "request succeeded", request, host, httpResponse);
onSuccess(host); onSuccess(host);
return response; return response;
} }
RequestLogger.log(logger, "request failed", request, host, httpResponse); RequestLogger.logResponse(logger, "request failed", request, host, httpResponse);
String responseBody; String responseBody;
try { try {
if (response.getEntity() == null) { if (response.getEntity() == null) {