bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] haproxy: fix blocking reload of service

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@23274 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
heil 2010-10-06 14:15:43 +00:00
parent 1b812eb536
commit 4cc1e82880
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/haproxy/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=1.4.8 PKG_VERSION:=1.4.8
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src

8
net/haproxy/files/haproxy.init
View File

@ -22,12 +22,10 @@ start() {
} }
stop() { stop() {
start-stop-daemon -q -K -x $HAPROXY_BIN -p $HAPROXY_PID service_kill ${HAPROXY_BIN##*/} $HAPROXY_PID
sleep 3 rm -f $HAPROXY_PID
kill -0 `cat $HAPROXY_PID` 2>/dev/null && \
start-stop-daemon -q -K -s KILL -x $HAPROXY_BIN -p $HAPROXY_PID
} }
reload() { reload() {
$HAPROXY_BIN -f $HAPROXY_CONFIG -p $HAPROXY_PID -st $(cat $HAPROXY_PID) $HAPROXY_BIN -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(<$HAPROXY_PID)
} }