svn commit: r911990 - /incubator/cassandra/trunk/bin/cassandra

[ee...@apache.org]

Author: eevans
Date: Fri Feb 19 21:30:36 2010
New Revision: 911990

URL: http://svn.apache.org/viewvc?rev=911990&view=rev
Log:
start avro daemon using -a arg to startup script

Patch by eevans; reviewed by gdusbabek for CASSANDRA-811

Modified:
    incubator/cassandra/trunk/bin/cassandra

Modified: incubator/cassandra/trunk/bin/cassandra
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/cassandra?rev=911990&r1=911989&r2=911990&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/cassandra (original)
+++ incubator/cassandra/trunk/bin/cassandra Fri Feb 19 21:30:36 2010
@@ -103,6 +103,7 @@
     pidpath=$1
     foreground=$2
     props=$3
+    class=$4
     cassandra_parms="-Dstorage-config=$CASSANDRA_CONF"
 
     if [ "x$pidpath" != "x" ]; then
@@ -113,12 +114,10 @@
     # to close stdout/stderr, but it's up to us not to background.
     if [ "x$foreground" != "x" ]; then
         cassandra_parms="$cassandra_parms -Dcassandra-foreground=yes"
-        $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props \
-                org.apache.cassandra.thrift.CassandraDaemon
+        $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props $class
     # Startup CassandraDaemon, background it, and write the pid.
     else
-        exec $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props \
-                    org.apache.cassandra.thrift.CassandraDaemon <&- &
+        exec $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props $class <&- &
         [ ! -z $pidpath ] && printf "%d" $! > $pidpath
     fi
 
@@ -126,9 +125,11 @@
 }
 
 # Parse any command line options.
-args=`getopt fhp:bD: "$@"`
+args=`getopt fahp:bD: "$@"`
 eval set -- "$args"
 
+classname="org.apache.cassandra.thrift.CassandraDaemon"
+
 while true; do
     case "$1" in
         -p)
@@ -147,6 +148,10 @@
             properties="$properties -D$2"
             shift 2
         ;;
+        -a)
+            classname="org.apache.cassandra.avro.CassandraDaemon"
+            shift
+        ;;
         --)
             shift
             break
@@ -159,7 +164,7 @@
 done
 
 # Start up the service
-launch_service "$pidfile" "$foreground" "$properties"
+launch_service "$pidfile" "$foreground" "$properties" "$classname"
 
 exit $?