Author: eevans
Date: Fri May 21 16:10:11 2010
New Revision: 947053
URL: http://svn.apache.org/viewvc?rev=947053&view=rev
Log:
start script causes flapping when used with runit
When started in the foreground, invoke Cassandra using exec so that it
replaces the current shell instead of running it from a sub-shell.
Patch by Cliff Moon; reviewed by eevans for CASSANDRA-1114
Modified:
cassandra/trunk/bin/cassandra
Modified: cassandra/trunk/bin/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra?rev=947053&r1=947052&r2=947053&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra (original)
+++ cassandra/trunk/bin/cassandra Fri May 21 16:10:11 2010
@@ -114,7 +114,7 @@ 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 $props $class
+ exec $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 $class <&-
&
