rpm/haproxy
SHA256
1
0
Fork 0
forked from pool/haproxy
Code Pull Requests Activity

Accepting request 333662 from server:http

Browse Source 
fix haproxy status checks (bsc#947204)

OBS-URL: https://build.opensuse.org/request/show/333662
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=33
This commit is contained in:
Stephan Kulow 2015-09-27 06:40:21 +00:00 committed by Git OBS Bridge
parent 26c4149063
commit d2f17d76bd
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
haproxy.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 23 19:26:54 UTC 2015 - dmueller@suse.com
- fix haproxy status checks (bsc#947204)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 8 09:10:02 UTC 2015 - kgronlund@suse.com Tue Sep 8 09:10:02 UTC 2015 - kgronlund@suse.com

7
haproxy.init
View File

@ -205,12 +205,13 @@ case "$1" in
rc_status -v rc_status -v
;; ;;
reload|force-reload) reload|force-reload)
if checkproc -p $HAPROXY_PID $HAPROXY_BIN; then ## Like force-reload, but if daemon does not support
## signaling, do nothing (!)
haproxy_check haproxy_check
# If it supports signaling:
echo -n "Reload service haproxy " echo -n "Reload service haproxy "
$HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID)
rc_status -v rc_status -v
fi
;; ;;
status) status)
echo -n "Checking for service haproxy " echo -n "Checking for service haproxy "
@ -226,7 +227,7 @@ case "$1" in
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values. # NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc $HAPROXY_BIN /sbin/checkproc -p $HAPROXY_PID $HAPROXY_BIN
# NOTE: rc_status knows that we called this init script with # NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly. # "status" option and adapts its messages accordingly.
rc_status -v rc_status -v