You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/19 03:47:24 UTC
incubator-usergrid git commit: Added a logging line to mark the
superuser as finished. Fixed PopulateSample logging info lines Separated
ToolBase so that we can run just the Cassandra tools independent of ES.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-395-two-dot-o [created] 48e62b682
Added a logging line to mark the superuser as finished.
Fixed PopulateSample logging info lines
Separated ToolBase so that we can run just the Cassandra tools independent of ES.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/48e62b68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/48e62b68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/48e62b68
Branch: refs/heads/USERGRID-395-two-dot-o
Commit: 48e62b682b4b4e02ebe1a01571864e47abc07f90
Parents: 198f479
Author: grey <gr...@apigee.com>
Authored: Wed Feb 18 18:47:22 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 18 18:47:22 2015 -0800
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/tools/PopulateSample.java | 2 +-
.../main/java/org/apache/usergrid/tools/ResetSuperUser.java | 5 ++++-
.../src/main/java/org/apache/usergrid/tools/ToolBase.java | 8 +++++++-
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48e62b68/stack/tools/src/main/java/org/apache/usergrid/tools/PopulateSample.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/PopulateSample.java b/stack/tools/src/main/java/org/apache/usergrid/tools/PopulateSample.java
index b67e9eb..48e2af6 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/PopulateSample.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/PopulateSample.java
@@ -46,7 +46,7 @@ import static org.apache.usergrid.services.ServicePayload.payload;
public class PopulateSample extends ToolBase {
- private static final Logger logger = LoggerFactory.getLogger( Export.class );
+ private static final Logger logger = LoggerFactory.getLogger( PopulateSample.class );
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48e62b68/stack/tools/src/main/java/org/apache/usergrid/tools/ResetSuperUser.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ResetSuperUser.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ResetSuperUser.java
index 2a5892e..2428d54 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ResetSuperUser.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ResetSuperUser.java
@@ -81,7 +81,7 @@ public class ResetSuperUser extends ToolBase {
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.usergrid.tools.ToolBase#runTool(org.apache.commons.cli.CommandLine)
*/
@@ -100,5 +100,8 @@ public class ResetSuperUser extends ToolBase {
logger.info( "Starting superuser provision" );
managementService.provisionSuperuser();
+
+ logger.info( "Finished superuser provision" );
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48e62b68/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
index d40434f..3e97f67 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
@@ -50,7 +50,7 @@ import static org.apache.usergrid.utils.JsonUtils.mapToFormattedJsonString;
/**
- * Base class for Usergrid Tools commands. Any class that implements this can be called with
+ * Base class for Usergrid Tools commands. Any class that implements this can be called with
* java -jar {jarname} org.apache.usergrid.tools.{classname}.
*/
public abstract class ToolBase {
@@ -95,7 +95,13 @@ public abstract class ToolBase {
if ( line.hasOption( "host" ) ) {
System.setProperty( "cassandra.url", line.getOptionValue( "host" ) );
+ }
+
+ if( line.hasOption( "eshost" )){
System.setProperty( "elasticsearch.hosts", line.getOptionValue( "eshost" ) );
+ }
+
+ if( line.hasOption( "escluster" )){
System.setProperty( "elasticsearch.cluster_name", line.getOptionValue( "escluster" ) );
}