Merge pull request #875 from BLasan/5.3.x

Feat: Add Socket Timeout

Author: BLasan

components/data-bridge/org.wso2.carbon.databridge.receiver.binary/src/main/java/org/wso2/carbon/databridge/receiver/binary/BinaryDataReceiverConstants.java

@@ -32,6 +32,8 @@ private BinaryDataReceiverConstants(){
     public static final int DEFAULT_TCP_RECEIVER_THREAD_POOL_SIZE = 100;
     public static final int DEFAULT_SSL_RECEIVER_PORT = 9611;
     public static final int DEFAULT_TCP_RECEIVER_PORT = 9711;
+    public static final String SOCKET_TIMEOUT = "socketTimeout";
+    public static final int DEFAULT_SOCKET_TIMEOUT = 0;
     public static final String DATA_BRIDGE_RECEIVER_CONFIG_NAME = "Binary";
     public static final String SSL_RECEIVER_PORT_CONFIG_NAME = "sslPort";
     public static final String TCP_RECEIVER_PORT_CONFIG_NAME = "tcpPort";

components/data-bridge/org.wso2.carbon.databridge.receiver.binary/src/main/java/org/wso2/carbon/databridge/receiver/binary/conf/BinaryDataReceiverConfiguration.java

@@ -35,6 +35,8 @@ public class BinaryDataReceiverConfiguration {
     private String sslProtocols;
     private String ciphers;
 
+    private int socketTimeout;
+
     public BinaryDataReceiverConfiguration(int sslPort, int tcpPort) {
         this.sslPort = sslPort;
         this.tcpPort = tcpPort;
@@ -61,6 +63,11 @@ public BinaryDataReceiverConfiguration(DataBridgeConfiguration dataBridgeConfigu
         sslProtocols =  sslProtocolObj != null ? sslProtocolObj.toString() : null;
         Object ciphersObj = dataReceiver.getConfiguration(BinaryDataReceiverConstants.SSL_RECEIVER_CIPHERS_CONFIG_NAME, null);
         ciphers =  sslProtocolObj != null ? ciphersObj.toString() : null;
+        this.socketTimeout = Integer.parseInt(dataReceiver.getConfiguration(BinaryDataReceiverConstants.SOCKET_TIMEOUT,
+                BinaryDataReceiverConstants.DEFAULT_SOCKET_TIMEOUT).toString());
+        if (this.socketTimeout < 0) {
+            this.socketTimeout = BinaryDataReceiverConstants.DEFAULT_SOCKET_TIMEOUT;
+        }
     }
 
     public int getSSLPort() {
@@ -95,4 +102,7 @@ public boolean isEnable() {
 
         return enable;
     }
+    public int getSocketTimeout() {
+        return socketTimeout;
+    }
 }

components/data-bridge/org.wso2.carbon.databridge.receiver.binary/src/main/java/org/wso2/carbon/databridge/receiver/binary/internal/BinaryDataReceiver.java

@@ -212,6 +212,7 @@ public void run() {
             while (true) {
                 try {
                     Socket socket = this.serverSocket.accept();
+                    socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     sslReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);
@@ -232,6 +233,7 @@ public void run() {
             while (true) {
                 try {
                     Socket socket = this.serverSocket.accept();
+                    socket.setSoTimeout(binaryDataReceiverConfiguration.getSocketTimeout());
                     tcpReceiverExecutorService.submit(new BinaryTransportReceiver(socket));
                 } catch (IOException e) {
                     log.error("Error while accepting the connection. ", e);