valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-5202: TNonblockingMultiFetchClient Use SLF4J Parameterized Logging

Browse Source 
Client: java
Patch: David Mollitor

This closes #2137

Use SLF4J API to log full Exception details.  Use SLF4J parameterized logging instead of String format.
This commit is contained in:
David Mollitor 2020-05-20 09:26:31 -04:00
parent 7de1f5d7f3
commit f8103c69ea
1 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java
View File

@ -77,8 +77,7 @@ import java.util.concurrent.TimeoutException;
public class TNonblockingMultiFetchClient {
private static final Logger LOGGER = LoggerFactory.getLogger(
TNonblockingMultiFetchClient.class.getName()
);
TNonblockingMultiFetchClient.class);
// if the size of the response msg exceeds this limit (in byte), we will
// not read the msg
@ -163,18 +162,18 @@ public class TNonblockingMultiFetchClient {
executor.execute(task);
try {
task.get(fetchTimeoutSeconds, TimeUnit.SECONDS);
} catch(InterruptedException ie) {
} catch (InterruptedException ie) {
// attempt to cancel execution of the task.
task.cancel(true);
LOGGER.error("interrupted during fetch: "+ie.toString());
} catch(ExecutionException ee) {
LOGGER.error("Interrupted during fetch", ie);
} catch (ExecutionException ee) {
// attempt to cancel execution of the task.
task.cancel(true);
LOGGER.error("exception during fetch: "+ee.toString());
} catch(TimeoutException te) {
LOGGER.error("Exception during fetch", ee);
} catch (TimeoutException te) {
// attempt to cancel execution of the task.
task.cancel(true);
LOGGER.error("timeout for fetch: "+te.toString());
LOGGER.error("Timeout for fetch", te);
}
executor.shutdownNow();
@ -215,8 +214,8 @@ public class TNonblockingMultiFetchClient {
try {
selector = Selector.open();
} catch (IOException e) {
LOGGER.error("selector opens error: "+e.toString());
} catch (IOException ioe) {
LOGGER.error("Selector opens error", ioe);
return;
}
@ -239,10 +238,8 @@ public class TNonblockingMultiFetchClient {
// attach index of the key
key.attach(i);
} catch (Exception e) {
stats.incNumConnectErrorServers();
String err = String.format("set up socket to server %s error: %s",
server.toString(), e.toString());
LOGGER.error(err);
stats.incNumConnectErrorServers();
LOGGER.error("Set up socket to server {} error", server, e);
// free resource
if (s != null) {
try {s.close();} catch (Exception ex) {}
@ -264,7 +261,7 @@ public class TNonblockingMultiFetchClient {
try{
selector.select();
} catch (Exception e) {
LOGGER.error("selector selects error: "+e.toString());
LOGGER.error("Selector selects error", e);
continue;
}
@ -284,10 +281,7 @@ public class TNonblockingMultiFetchClient {
sChannel.finishConnect();
} catch (Exception e) {
stats.incNumConnectErrorServers();
String err = String.format("socket %d connects to server %s " +
"error: %s",
index, servers.get(index).toString(), e.toString());
LOGGER.error(err);
LOGGER.error("Socket {} connects to server {} error", index, servers.get(index), e);
}
}
@ -299,10 +293,7 @@ public class TNonblockingMultiFetchClient {
SocketChannel sChannel = (SocketChannel)selKey.channel();
sChannel.write(sendBuf[index]);
} catch (Exception e) {
String err = String.format("socket %d writes to server %s " +
"error: %s",
index, servers.get(index).toString(), e.toString());
LOGGER.error(err);
LOGGER.error("Socket {} writes to server {} error", index, servers.get(index), e);
}
}
}
@ -325,10 +316,8 @@ public class TNonblockingMultiFetchClient {
if (frameSize[index] <= 0) {
stats.incNumInvalidFrameSize();
String err = String.format("Read an invalid frame size %d"
+ " from %s. Does the server use TFramedTransport? ",
frameSize[index], servers.get(index).toString());
LOGGER.error(err);
LOGGER.error("Read an invalid frame size {} from {}. Does the server use TFramedTransport?",
frameSize[index], servers.get(index));
sChannel.close();
continue;
}
@ -339,11 +328,8 @@ public class TNonblockingMultiFetchClient {
if (frameSize[index] + 4 > maxRecvBufBytesPerServer) {
stats.incNumOverflowedRecvBuf();
String err = String.format("Read frame size %d from %s,"
+ " total buffer size would exceed limit %d",
frameSize[index], servers.get(index).toString(),
maxRecvBufBytesPerServer);
LOGGER.error(err);
LOGGER.error("Read frame size {} from {}, total buffer size would exceed limit {}",
frameSize[index], servers.get(index), maxRecvBufBytesPerServer);
sChannel.close();
continue;
}
@ -366,10 +352,8 @@ public class TNonblockingMultiFetchClient {
}
}
} catch (Exception e) {
String err = String.format("socket %d reads from server %s " +
"error: %s",
index, servers.get(index).toString(), e.toString());
LOGGER.error(err);
LOGGER.error("Socket {} reads from server {} error",
index, servers.get(index), e);
}
}
}
@ -392,7 +376,7 @@ public class TNonblockingMultiFetchClient {
selector.close();
}
} catch (IOException e) {
LOGGER.error("free resource error: "+e.toString());
LOGGER.error("Free resource error", e);
}
}
}