From owner-svn-ports-all@freebsd.org Sat Feb 6 17:10:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41DBEA9FADB; Sat, 6 Feb 2016 17:10:59 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DC651AD3; Sat, 6 Feb 2016 17:10:59 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16HAwAD010365; Sat, 6 Feb 2016 17:10:58 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16HAvx9010362; Sat, 6 Feb 2016 17:10:57 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201602061710.u16HAvx9010362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 6 Feb 2016 17:10:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408306 - in head/net-mgmt/riemann: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Feb 2016 17:10:59 -0000 Author: pi Date: Sat Feb 6 17:10:57 2016 New Revision: 408306 URL: https://svnweb.freebsd.org/changeset/ports/408306 Log: net-mgmt/riemann: fix startup script - use a simple pidfile instead of a whole piddir - add a -Dapp=riemann parameter to java invocation so ps | grep can find riemann easily - remove procname and rely on daemon to handle this - use daemon's pid and not riemanns' pid (-P parent flag change) - add daemon's -r restart flag to keep java running at all costs PR: 204988 Submitted by: David D'Amico Approved by: Dave Cottlehuber (maintainer) Modified: head/net-mgmt/riemann/Makefile head/net-mgmt/riemann/files/riemann.in head/net-mgmt/riemann/pkg-plist Modified: head/net-mgmt/riemann/Makefile ============================================================================== --- head/net-mgmt/riemann/Makefile Sat Feb 6 17:09:39 2016 (r408305) +++ head/net-mgmt/riemann/Makefile Sat Feb 6 17:10:57 2016 (r408306) @@ -3,6 +3,7 @@ PORTNAME= riemann PORTVERSION= 0.2.10 +PORTREVISION= 1 CATEGORIES= net-mgmt java MASTER_SITES= https://wintermute.skunkwerks.at/${PORTNAME}/releases/${PORTVERSION}/ \ http://aphyr.com/${PORTNAME}/ @@ -22,13 +23,13 @@ SUB_FILES= ${PORTNAME} SUB_LIST+= JAVA_HOME=${JAVA_HOME} \ RIEMANN_USER=${RIEMANN_USER} \ RIEMANN_GROUP=${RIEMANN_GROUP} \ - RIEMANN_PIDDIR=${RIEMANN_PIDDIR} \ + RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \ RIEMANN_LOGDIR=${RIEMANN_LOGDIR} PLIST_SUB= JAVA_HOME=${JAVA_HOME} \ RIEMANN_USER=${RIEMANN_USER} \ RIEMANN_GROUP=${RIEMANN_GROUP} \ - RIEMANN_PIDDIR=${RIEMANN_PIDDIR} \ + RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \ RIEMANN_LOGDIR=${RIEMANN_LOGDIR} RIEMANN_USER?= ${PORTNAME} @@ -44,13 +45,12 @@ GROUPS= ${PORTNAME} USE_RC_SUBR= ${PORTNAME} RIEMANN_LOGDIR= /var/log/${PORTNAME}/ -RIEMANN_PIDDIR= /var/run/${PORTNAME}/ +RIEMANN_PIDFILE= /var/run/${PORTNAME}.pid do-install: ${MKDIR} \ ${STAGEDIR}${JAVAJARDIR} \ ${STAGEDIR}${ETCDIR} \ - ${STAGEDIR}${RIEMANN_PIDDIR} \ ${STAGEDIR}${RIEMANN_LOGDIR} ${INSTALL_DATA} \ ${WRKSRC}/lib/${PORTNAME}.jar \ Modified: head/net-mgmt/riemann/files/riemann.in ============================================================================== --- head/net-mgmt/riemann/files/riemann.in Sat Feb 6 17:09:39 2016 (r408305) +++ head/net-mgmt/riemann/files/riemann.in Sat Feb 6 17:10:57 2016 (r408306) @@ -36,6 +36,7 @@ load_rc_config $name : ${riemann_min_mem:="256m"} : ${riemann_max_mem:="1g"} : ${riemann_java_opts:=" -server \ + -Dapp=${name} \ -Xms${riemann_min_mem} \ -Xmx${riemann_max_mem} \ -Xss256k \ @@ -53,16 +54,17 @@ load_rc_config $name -XX:+UseParNewGC \ -XX:CMSInitiatingOccupancyFraction=75 "} -riemann_pidfile="%%RIEMANN_PIDDIR%%${name}.pid" +pidfile="%%RIEMANN_PIDFILE%%" command="/usr/sbin/daemon" -procname="${riemann_java_home}/bin/java" -command_args="-f -c -p ${riemann_pidfile} ${procname} ${riemann_java_opts} \ +command_args="-f -c -r -P ${pidfile} \ + ${riemann_java_home}/bin/java \ + ${riemann_java_opts} \ -jar ${riemann_jarfile} ${riemann_config}" required_files="${java_cmd} ${riemann_config}" riemann_prestart() { - install -o ${riemann_user} /dev/null ${riemann_pidfile} + install -o ${riemann_user} /dev/null ${pidfile} } start_precmd=${name}_prestart Modified: head/net-mgmt/riemann/pkg-plist ============================================================================== --- head/net-mgmt/riemann/pkg-plist Sat Feb 6 17:09:39 2016 (r408305) +++ head/net-mgmt/riemann/pkg-plist Sat Feb 6 17:10:57 2016 (r408306) @@ -1,4 +1,3 @@ %%JAVAJARDIR%%/riemann.jar @sample %%ETCDIR%%/riemann.config.sample @dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%% -@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_PIDDIR%%