[geode] branch develop updated: GEODE-6666: Catch SocketTimeoutException (#3478)

[khowe]

This is an automated email from the ASF dual-hosted git repository.

khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 7a82437  GEODE-6666: Catch SocketTimeoutException (#3478)
7a82437 is described below

commit 7a8243700b2d02d476affccba5ae508335018bb2
Author: Kenneth Howe <kh...@pivotal.io>
AuthorDate: Thu Apr 18 09:17:25 2019 -0700

    GEODE-6666: Catch SocketTimeoutException (#3478)
    
    To avoid filling up logs, only log the exception message, not the full 
stack trace
    
    Co-authored-by: Ken Howe <kh...@pivotal.io>
---
 .../apache/geode/distributed/internal/tcpserver/TcpServer.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index 47e962d..f6604c6 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
@@ -381,6 +382,13 @@ public class TcpServer {
         // client went away - ignore
       } catch (CancelException ignore) {
         // ignore
+      } catch (SocketTimeoutException ex) {
+        String sender = null;
+        if (socket != null) {
+          sender = socket.getInetAddress().getHostAddress();
+        }
+        // Do not want the full stack trace to fill up the logs
+        log.info("Exception in processing request from " + sender + ": " + 
ex.getMessage());
       } catch (ClassNotFoundException ex) {
         String sender = null;
         if (socket != null) {