svn commit: r448026 - in head/net: haproxy-devel/files haproxy/files

[Dmitry Sivachenko]

Author: demon
Date: Wed Aug 16 08:06:57 2017
New Revision: 448026
URL: https://svnweb.freebsd.org/changeset/ports/448026

Log:
  Add hardstop/hardreload commands to rc script (to stop/reload haproxy without
  waiting for existing connections to close).
  
  PR:		221402
  Submitted by:	Frank Wall <fw at moov.de>

Modified:
  head/net/haproxy-devel/files/haproxy.in
  head/net/haproxy/files/haproxy.in

Modified: head/net/haproxy-devel/files/haproxy.in
==============================================================================
--- head/net/haproxy-devel/files/haproxy.in	Wed Aug 16 07:34:22 2017	(r448025)
+++ head/net/haproxy-devel/files/haproxy.in	Wed Aug 16 08:06:57 2017	(r448026)
@@ -29,18 +29,28 @@
 name="haproxy"
 rcvar=haproxy_enable
 command="%%PREFIX%%/sbin/haproxy"
-extra_commands="reload configtest"
+extra_commands="reload configtest hardstop hardreload"
 reload_cmd="haproxy_reload"
+hardreload_cmd="haproxy_reload"
+hardreload_precmd="def_hardreload_option"
 stop_cmd="haproxy_stop"
+hardstop_cmd="haproxy_stop"
+hardstop_precmd="def_hardstop_signal"
 
 : ${haproxy_enable:="NO"}
 : ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
 pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
 
-if [ -z "$rc_force" ]; then
-    sig_stop="USR1"
-fi
+def_hardreload_option()
+{
+    reload_opt="-st"
+}
 
+def_hardstop_signal()
+{
+    sig_stop="TERM"
+}
+
 load_rc_config $name
 
 is_valid_profile() {
@@ -81,6 +91,8 @@ fi
 configtest_cmd="$command -c -f $haproxy_config"
 start_precmd="$command -q -c -f $haproxy_config"
 required_files=$haproxy_config
+sig_stop=SIGUSR1
+reload_opt="-sf"
 
 haproxy_reload()
 {
@@ -90,11 +102,7 @@ haproxy_reload()
 	fi
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
-		if [ -z "$rc_force" ]; then
-			${command} ${haproxy_flags} -sf $(cat ${pidfile})
-		else
-			${command} ${haproxy_flags} -st $(cat ${pidfile})
-		fi
+		${command} ${haproxy_flags} $reload_opt $(cat ${pidfile})
 	else
 		_run_rc_notrunning
 		return 1

Modified: head/net/haproxy/files/haproxy.in
==============================================================================
--- head/net/haproxy/files/haproxy.in	Wed Aug 16 07:34:22 2017	(r448025)
+++ head/net/haproxy/files/haproxy.in	Wed Aug 16 08:06:57 2017	(r448026)
@@ -29,18 +29,28 @@
 name="haproxy"
 rcvar=haproxy_enable
 command="%%PREFIX%%/sbin/haproxy"
-extra_commands="reload configtest"
+extra_commands="reload configtest hardstop hardreload"
 reload_cmd="haproxy_reload"
+hardreload_cmd="haproxy_reload"
+hardreload_precmd="def_hardreload_option"
 stop_cmd="haproxy_stop"
+hardstop_cmd="haproxy_stop"
+hardstop_precmd="def_hardstop_signal"
 
 : ${haproxy_enable:="NO"}
 : ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"}
 pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"}
 
-if [ -z "$rc_force" ]; then
-    sig_stop="USR1"
-fi
+def_hardreload_option()
+{
+    reload_opt="-st"
+}
 
+def_hardstop_signal()
+{
+    sig_stop="TERM"
+}
+
 load_rc_config $name
 
 is_valid_profile() {
@@ -81,6 +91,8 @@ fi
 configtest_cmd="$command -c -f $haproxy_config"
 start_precmd="$command -q -c -f $haproxy_config"
 required_files=$haproxy_config
+sig_stop=SIGUSR1
+reload_opt="-sf"
 
 haproxy_reload()
 {
@@ -90,11 +102,7 @@ haproxy_reload()
 	fi
 	rc_pid=$(check_pidfile ${pidfile} ${command})
 	if [ $rc_pid ]; then
-		if [ -z "$rc_force" ]; then
-			${command} ${haproxy_flags} -sf $(cat ${pidfile})
-		else
-			${command} ${haproxy_flags} -st $(cat ${pidfile})
-		fi
+		${command} ${haproxy_flags} $reload_opt $(cat ${pidfile})
 	else
 		_run_rc_notrunning
 		return 1