Hello community,

here is the log from the commit of package haproxy for openSUSE:Factory checked 
in at 2015-09-27 08:40:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
 and      /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "haproxy"

Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes  2015-09-08 
18:11:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes     2015-09-27 
08:39:44.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Sep 23 19:26:54 UTC 2015 - dmuel...@suse.com
+
+- fix haproxy status checks (bsc#947204)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ haproxy.init ++++++
--- /var/tmp/diff_new_pack.KSIfMC/_old  2015-09-27 08:39:45.000000000 +0200
+++ /var/tmp/diff_new_pack.KSIfMC/_new  2015-09-27 08:39:45.000000000 +0200
@@ -205,12 +205,13 @@
         rc_status -v
         ;;
     reload|force-reload)
-        if checkproc -p $HAPROXY_PID $HAPROXY_BIN; then
-                haproxy_check
-                echo -n "Reload service haproxy "
-                $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat 
$HAPROXY_PID)
-                rc_status -v
-        fi
+        ## Like force-reload, but if daemon does not support
+        ## signaling, do nothing (!)
+        haproxy_check
+        # If it supports signaling:
+        echo -n "Reload service haproxy "
+        $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat 
$HAPROXY_PID)
+        rc_status -v
         ;;
     status)
         echo -n "Checking for service haproxy "
@@ -226,7 +227,7 @@
         # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
 
         # 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
         # "status" option and adapts its messages accordingly.
         rc_status -v


Reply via email to