Minor fixes

EinsamHauer · Oct 8, 2021 · b93796b · b93796b
1 parent fbcbdb4
commit b93796b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/net/iponweb/disthene/carbon/CarbonServerHandler.java b/src/main/java/net/iponweb/disthene/carbon/CarbonServerHandler.java
@@ -15,6 +15,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.net.InetSocketAddress;
+
 /**
  * @author Andrei Ivanov
  */
@@ -77,7 +79,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         ctx.channel().close();
 
         if (cause instanceof java.io.IOException) {
-            logger.debug("Exception caught in carbon handler", cause);
+            logger.trace("Exception caught in carbon handler (connection from " + ((InetSocketAddress)ctx.channel().remoteAddress()).getAddress().getHostAddress() + ")", cause);
         } else {
             logger.error("Exception caught in carbon handler", cause);
         }

diff --git a/src/main/java/net/iponweb/disthene/service/store/CassandraService.java b/src/main/java/net/iponweb/disthene/service/store/CassandraService.java
@@ -49,6 +49,7 @@ public CassandraService(StoreConfiguration storeConfiguration, MBassador<Disthen
                         .withStringList(DefaultDriverOption.CONTACT_POINTS, getContactPoints(storeConfiguration))
                         .withDuration(DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds(storeConfiguration.getReadTimeout()))
                         .withDuration(DefaultDriverOption.CONNECTION_CONNECT_TIMEOUT, Duration.ofSeconds(storeConfiguration.getConnectTimeout()))
+                        .withDuration(DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds(storeConfiguration.getConnectTimeout()))
                         .withString(DefaultDriverOption.REQUEST_CONSISTENCY, "ONE")
                         .withClass(DefaultDriverOption.LOAD_BALANCING_POLICY_CLASS, DcInferringLoadBalancingPolicy.class)
                         .withInt(DefaultDriverOption.CONNECTION_POOL_LOCAL_SIZE, storeConfiguration.getMaxConnections())