diff options
| author | Koichiro Iwao <meta@FreeBSD.org> | 2018-04-02 05:55:16 +0000 |
|---|---|---|
| committer | Koichiro Iwao <meta@FreeBSD.org> | 2018-04-02 05:55:16 +0000 |
| commit | 23cef117668d14a579ccd6520125f56b18b17283 (patch) | |
| tree | 3ddb4b23e8e1ff5017440cadb79df44f6696eb9c | |
| parent | eb419e9fa528e4a8d3c93683b24b27f6d2712d81 (diff) | |
| download | ports-23cef117668d14a579ccd6520125f56b18b17283.tar.gz ports-23cef117668d14a579ccd6520125f56b18b17283.zip | |
databases/go-carbon: Improve rc.d script
Fixes an error with restart.
PR: 226937
Submitted by: Andreas Andersson <a.andersson.thn@gmail.com>
Approved by: hrs (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=466198
| -rw-r--r-- | databases/go-carbon/Makefile | 2 | ||||
| -rw-r--r-- | databases/go-carbon/files/go-carbon.in | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/databases/go-carbon/Makefile b/databases/go-carbon/Makefile index 328aef367cde..2499d56ca331 100644 --- a/databases/go-carbon/Makefile +++ b/databases/go-carbon/Makefile @@ -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 diff --git a/databases/go-carbon/files/go-carbon.in b/databases/go-carbon/files/go-carbon.in index c2d5032e6e13..5fcf83062654 100644 --- a/databases/go-carbon/files/go-carbon.in +++ b/databases/go-carbon/files/go-carbon.in @@ -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" |