From owner-svn-ports-all@freebsd.org Mon Apr 2 05:55:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 721B5F74817; Mon, 2 Apr 2018 05:55:17 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1970C6F171; Mon, 2 Apr 2018 05:55:17 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1001F11BB7; Mon, 2 Apr 2018 05:55:17 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w325tGI4034385; Mon, 2 Apr 2018 05:55:16 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w325tGQu034383; Mon, 2 Apr 2018 05:55:16 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201804020555.w325tGQu034383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 2 Apr 2018 05:55:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466198 - in head/databases/go-carbon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/databases/go-carbon: . files X-SVN-Commit-Revision: 466198 X-SVN-Commit-Repository: ports 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.25 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: Mon, 02 Apr 2018 05:55:17 -0000 Author: meta Date: Mon Apr 2 05:55:16 2018 New Revision: 466198 URL: https://svnweb.freebsd.org/changeset/ports/466198 Log: databases/go-carbon: Improve rc.d script Fixes an error with restart. PR: 226937 Submitted by: Andreas Andersson Approved by: hrs (mentor, implicit) Modified: head/databases/go-carbon/Makefile head/databases/go-carbon/files/go-carbon.in Modified: head/databases/go-carbon/Makefile ============================================================================== --- head/databases/go-carbon/Makefile Mon Apr 2 05:46:20 2018 (r466197) +++ head/databases/go-carbon/Makefile Mon Apr 2 05:55:16 2018 (r466198) @@ -3,7 +3,7 @@ PORTNAME= go-carbon DISTVERSIONPREFIX= v DISTVERSION= 0.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= a.andersson.thn@gmail.com Modified: head/databases/go-carbon/files/go-carbon.in ============================================================================== --- head/databases/go-carbon/files/go-carbon.in Mon Apr 2 05:46:20 2018 (r466197) +++ head/databases/go-carbon/files/go-carbon.in Mon Apr 2 05:55:16 2018 (r466198) @@ -21,35 +21,36 @@ . /etc/rc.subr -name="go-carbon" +name="go_carbon" rcvar="go_carbon_enable" +load_rc_config $name : ${go_carbon_enable:="NO"} : ${go_carbon_user:="carbon"} : ${go_carbon_config:="/usr/local/etc/go-carbon/go-carbon.conf"} -start_cmd="go_carbon_start" -stop_cmd="go_carbon_stop" -status_cmd="go_carbon_status" -procname="/usr/local/bin/go-carbon" pidfile="/var/run/$name.pid" +procname="%%PREFIX%%/bin/go-carbon" +command=/usr/sbin/daemon +command_args="-f -c -p ${pidfile} ${procname} -config ${go_carbon_config}" -# read configuration and set defaults -load_rc_config "$name" +extra_commands="reload" +reload_command="go_carbon_reload" +start_precmd="go_carbon_precmd" -go_carbon_start() +go_carbon_precmd() { - ${procname} -config ${go_carbon_config} -daemon -pidfile ${pidfile} + install -o ${go_carbon_user} /dev/null ${pidfile} } -go_carbon_stop() +carbonapi_reload() { - kill -TERM `cat /var/run/go-carbon.pid` -} - -go_carbon_status() -{ - echo "go-carbon is running as pid" `cat /var/run/go-carbon.pid` + if [ -n "$pid" ]; then + kill -HUP $pid + echo "go-carbon config reloaded." + else + echo "go-carbon not running." + fi } run_rc_command "$1"