You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/11/21 20:22:52 UTC
usergrid git commit: Fix log4j props in Services and destroy db
session before re-creating schema to make sure meta gets refreshed.
Repository: usergrid
Updated Branches:
refs/heads/master ebab21e0b -> cf06b4e4d
Fix log4j props in Services and destroy db session before re-creating schema to make sure meta gets refreshed.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cf06b4e4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cf06b4e4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cf06b4e4
Branch: refs/heads/master
Commit: cf06b4e4debc1d9aab44608d46ff08935c3e2d7e
Parents: ebab21e
Author: Michael Russo <mr...@apigee.com>
Authored: Mon Nov 21 12:21:56 2016 -0800
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Nov 21 12:21:56 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/CoreSchemaManager.java | 4 +++-
stack/services/pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/cf06b4e4/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
index 5488142..1541d4b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
@@ -85,9 +85,11 @@ public class CoreSchemaManager implements SchemaManager {
dataStaxCluster.getClusterSession()
.execute("DROP KEYSPACE "+ CQLUtils.quote(cassandraFig.getApplicationKeyspace()));
dataStaxCluster.waitForSchemaAgreement();
+
+ dataStaxCluster.getClusterSession().close(); // close session so it's meta will get refreshed
}
catch ( Exception e ) {
- //swallow if it just doesn't exist
+ logger.error("Error dropping application keyspace: {}", cassandraFig.getApplicationKeyspace());
}
logger.info( "keyspaces dropped" );
logger.info( "dropping indices" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/cf06b4e4/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 4f892d6..8cd1756 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -103,7 +103,7 @@
<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true
-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar
- ${ug.argline}
+ ${ug.argline} -Dlog4j.configuration=file:${basedir}/src/test/resources/log4j.properties
</argLine>
<includes>
<include>**/*IT.java</include>