eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject [4/5] incubator-eagle git commit: remove --jar in eagle-topology.sh
Date Mon, 30 Nov 2015 02:49:01 GMT
remove --jar in eagle-topology.sh


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/4046666b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/4046666b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/4046666b

Branch: refs/heads/master
Commit: 4046666b170d4b3d8b3fcbcf3fc1b24e55f0d2dc
Parents: c38b922
Author: Zhao, Qingwen <qingwzhao@ebay.com>
Authored: Thu Nov 26 15:44:02 2015 +0800
Committer: Zhao, Qingwen <qingwzhao@ebay.com>
Committed: Thu Nov 26 15:44:02 2015 +0800

----------------------------------------------------------------------
 eagle-assembly/src/main/bin/eagle-topology.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4046666b/eagle-assembly/src/main/bin/eagle-topology.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-topology.sh b/eagle-assembly/src/main/bin/eagle-topology.sh
index ebcef9c..e1104ac 100755
--- a/eagle-assembly/src/main/bin/eagle-topology.sh
+++ b/eagle-assembly/src/main/bin/eagle-topology.sh
@@ -22,14 +22,13 @@ TOPOLOGY_NAME_SET=0
 function print_help() {
 	echo "Usage: $0 options {start | stop | status}"
 	echo "Options:                       Description:"
-	echo "  --jar      <jar path>          Default is $EAGLE_HOME/lib/topology/eagle-topology-0.1.0-assembly.jar"
 	echo "  --main     <main class>        Default is org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain"
 	echo "  --topology <topology name>     Default is sandbox-hdfsAuditLog-topology"
 	echo "  --config   <file path>         Default is $EAGLE_HOME/conf/sandbox-hdfsAuditLog-application.conf"
 	echo "  --storm-ui <storm ui url>      Execute through storm UI API, default: http://localhost:8744"
 
 	echo "Command Examples:"
-	echo "  $0 [--jar <jarPath>] --main <mainClass> [--topology <topologyName>]
--config <filePath> start"
+	echo "  $0 --main <mainClass> [--topology <topologyName>] --config <filePath>
start"
 	echo "  $0 --topology <topologyName> stop"
 	echo "  $0 --topology <topologyName> status"
 }
@@ -64,14 +63,6 @@ case $1 in
         cmd=$1
         shift
         ;;
-    --jar)
-         if [ $# -lt 3 ]; then
-             print_help
-             exit 1
-         fi
-         jarName=$2
-         shift 2
-         ;;
     --main)
         if [ $# -lt 3 ]; then
             print_help
@@ -110,6 +101,8 @@ case $1 in
 done
 
 
+jarName=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
+
 if [ -z "$jarName" ]; then
     echo "Error: jar file is not found"
     exit 1
@@ -163,7 +156,7 @@ case $cmd in
 	    echo "Checking topology $topologyName status ..."
 	    output=`storm list  -c nimbus.host=$EAGLE_NIMBUS_HOST | grep $topologyName`
 	    if [ $? != 0 ];then
-	        echo "Topolog is not alive: $topologyName is not found"
+	        echo "Topology is not alive: $topologyName is not found"
 	        exit 1
 	    fi
 


Mime
View raw message