Repository: usergrid
Updated Branches:
  refs/heads/master cd7e803d1 -> 0dc7d031b


Set core and max connections to be the same for the datastax driver.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0dc7d031
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0dc7d031
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0dc7d031

Branch: refs/heads/master
Commit: 0dc7d031b451e3ee396827cdbf8e21063af44576
Parents: cd7e803
Author: Michael Russo <mru...@apigee.com>
Authored: Fri Nov 11 22:30:27 2016 -0800
Committer: Michael Russo <mru...@apigee.com>
Committed: Fri Nov 11 22:30:27 2016 -0800

----------------------------------------------------------------------
 .../persistence/core/datastax/impl/DataStaxClusterImpl.java        | 2 +-
 stack/corepersistence/queue/src/test/resources/log4j.properties    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/0dc7d031/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
----------------------------------------------------------------------
diff --git 
a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
 
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
index b36adab..65d4e27 100644
--- 
a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
+++ 
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java
@@ -205,7 +205,7 @@ public class DataStaxClusterImpl implements DataStaxCluster 
{
         }
 
         final PoolingOptions poolingOptions = new PoolingOptions()
-            .setCoreConnectionsPerHost(HostDistance.LOCAL, 
cassandraConfig.getConnections() / 2)
+            .setCoreConnectionsPerHost(HostDistance.LOCAL, 
cassandraConfig.getConnections())
             .setMaxConnectionsPerHost(HostDistance.LOCAL, 
cassandraConfig.getConnections())
             .setIdleTimeoutSeconds( cassandraConfig.getTimeout() / 1000)
             .setPoolTimeoutMillis( cassandraConfig.getPoolTimeout());

http://git-wip-us.apache.org/repos/asf/usergrid/blob/0dc7d031/stack/corepersistence/queue/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/resources/log4j.properties 
b/stack/corepersistence/queue/src/test/resources/log4j.properties
index 1b14d87..b81af29 100644
--- a/stack/corepersistence/queue/src/test/resources/log4j.properties
+++ b/stack/corepersistence/queue/src/test/resources/log4j.properties
@@ -33,4 +33,6 @@ 
log4j.logger.org.apache.usergrid.persistence.qakka.serialization.sharding=TRACE
 #log4j.logger.org.apache.usergrid.persistence.qakka.distributed.actors=TRACE
 
log4j.logger.org.apache.usergrid.persistence.qakka.distributed.actors.ShardAllocator=TRACE
 
+log4j.logger.org.safehaus.guicyfig=ERROR
+
 

Reply via email to