natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

have bin/cassandra startup script respect JAVA_HOME 

Patch by Joe Stump; reviewed by eevans for CASSANDRA-352

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802067 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2009-08-07 16:19:32 +00:00
parent 449a444c7d
commit 3924ae9fe8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/cassandra
View File

@ -20,6 +20,11 @@
# -f: start in foreground
# -p <filename>: log the pid to a file (useful to kill it later)
if [ -x $JAVA_HOME/bin/java ]; then
JAVA=$JAVA_HOME/bin/java
else
JAVA=`which java`
fi
if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
for include in /usr/share/cassandra/cassandra.in.sh \
@ -62,11 +67,11 @@ launch_service()
# 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 \
$JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH \
org.apache.cassandra.service.CassandraDaemon
# Startup CassandraDaemon, background it, and write the pid.
else
exec java $JVM_OPTS $cassandra_parms -cp $CLASSPATH \
exec $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH \
org.apache.cassandra.service.CassandraDaemon <&- &
[ ! -z $pidpath ] && printf "%d" $! > $pidpath
fi