Date: Tue, 30 Sep 2014 08:10:31 +0000 (UTC) From: Bartek Rutkowski <robak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369575 - in head/databases/cassandra: . files Message-ID: <201409300810.s8U8AV6H041016@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: robak Date: Tue Sep 30 08:10:30 2014 New Revision: 369575 URL: http://svnweb.freebsd.org/changeset/ports/369575 QAT: https://qat.redports.org/buildarchive/r369575/ Log: databases/cassandra: minor cleanup in rc script PR: 193258 Submitted by: Radim Kolar <hsn@sendmail.cz> Approved by: mentors (implicit) Modified: head/databases/cassandra/Makefile head/databases/cassandra/files/cassandra.in Modified: head/databases/cassandra/Makefile ============================================================================== --- head/databases/cassandra/Makefile Tue Sep 30 07:59:15 2014 (r369574) +++ head/databases/cassandra/Makefile Tue Sep 30 08:10:30 2014 (r369575) @@ -3,6 +3,7 @@ PORTNAME= cassandra PORTVERSION= 1.2.18 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} Modified: head/databases/cassandra/files/cassandra.in ============================================================================== --- head/databases/cassandra/files/cassandra.in Tue Sep 30 07:59:15 2014 (r369574) +++ head/databases/cassandra/files/cassandra.in Tue Sep 30 08:10:30 2014 (r369575) @@ -24,15 +24,16 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH # DAMAGE. +# $FreeBSD$ +# # PROVIDE: cassandra # REQUIRE: LOGIN # KEYWORD: shutdown # -# $FreeBSD$ . /etc/rc.subr -name="cassandra" +name=cassandra rcvar=cassandra_enable load_rc_config $name @@ -44,7 +45,7 @@ cassandra_newgen=${cassandra_newgen:-"30 command=%%DATADIR%%/bin/cassandra command_args="-p /var/run/cassandra.pid >/dev/null" stop_precmd="${name}_prestop" -sig_stop="KILL" +sig_stop=KILL procname="%%LOCALBASE%%/openjdk7/bin/java" pidfile=/var/run/cassandra.pid @@ -59,7 +60,8 @@ export JVM_OVERRIDE_OPTS="$cassandra_vma export JAVA_VENDOR=openjdk export JAVA_VERSION=1.7 -cassandra_prestop() { +cassandra_prestop() +{ $CASSANDRA_HOME/bin/nodetool -h localhost drain return 0 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409300810.s8U8AV6H041016>