Manage reload for plackup
This commit is contained in:
parent
a61ef89228
commit
12e5094628
19
Makefile
19
Makefile
|
@ -327,13 +327,7 @@ start_web_server: all prepare_test_server
|
||||||
-c `pwd`/e2e-tests/nginx.conf \
|
-c `pwd`/e2e-tests/nginx.conf \
|
||||||
2>&1 | grep -v 'Permission denied' || true; \
|
2>&1 | grep -v 'Permission denied' || true; \
|
||||||
echo "Launching plackup"; \
|
echo "Launching plackup"; \
|
||||||
/sbin/start-stop-daemon --start \
|
$(MAKE) plackup; \
|
||||||
--pidfile e2e-tests/conf/plackup.pid \
|
|
||||||
-d `pwd` -b -m \
|
|
||||||
--exec /usr/bin/plackup -- \
|
|
||||||
-s FCGI \
|
|
||||||
--listen e2e-tests/conf/llng.sock \
|
|
||||||
e2e-tests/handler-server.psgi; \
|
|
||||||
else \
|
else \
|
||||||
echo "!!!!! Unknown test server: $(TESTWEBSERVER) !!!!!" >&2; \
|
echo "!!!!! Unknown test server: $(TESTWEBSERVER) !!!!!" >&2; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
|
@ -345,6 +339,8 @@ reload_web_server:
|
||||||
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
|
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
|
||||||
elif [ -e e2e-tests/conf/nginx.pid ]; then \
|
elif [ -e e2e-tests/conf/nginx.pid ]; then \
|
||||||
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
|
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
|
||||||
|
kill `cat e2e-tests/conf/plackup.pid` || true; \
|
||||||
|
$(MAKE) plackup; \
|
||||||
else \
|
else \
|
||||||
$(MAKE) start_web_server; \
|
$(MAKE) start_web_server; \
|
||||||
fi
|
fi
|
||||||
|
@ -365,6 +361,15 @@ stop_web_server:
|
||||||
|
|
||||||
restart_web_server: start_web_server
|
restart_web_server: start_web_server
|
||||||
|
|
||||||
|
plackup:
|
||||||
|
@/sbin/start-stop-daemon --start \
|
||||||
|
--pidfile e2e-tests/conf/plackup.pid \
|
||||||
|
-d `pwd` -b -m \
|
||||||
|
--exec /usr/bin/plackup -- \
|
||||||
|
-s FCGI \
|
||||||
|
--listen e2e-tests/conf/llng.sock \
|
||||||
|
e2e-tests/handler-server.psgi
|
||||||
|
|
||||||
#
|
#
|
||||||
# INSTALL
|
# INSTALL
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue
Block a user