[gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

["Tiziano Müller" <dev-zero@gentoo.org>]

commit:     76c2dc75284b2ba0733cac17673ca8a399e54301
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:39:39 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:39:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=76c2dc75

make the init.d script recognize the emperor mode

---
 www-servers/uwsgi/Manifest          |    4 ++--
 www-servers/uwsgi/files/uwsgi.confd |   16 ++++++++--------
 www-servers/uwsgi/files/uwsgi.initd |    8 +++++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 48a306b..ce87e07 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,8 @@
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
-AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
-AUX uwsgi.initd 2112 RMD160 cb71ca5b5f27c5ee918e02c0dd562e6b79ec7543 SHA1 fbfc9c17941962d917ab549108581b2e9d016217 SHA256 635f30cc4a414cbb50c96a500432d2da35bfbb7ab715dce010783f0db7e2d9f0
+AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134b41d95205f585197828e5e0e2bccd475787fce0a7
+AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c51b62f89c48126e1228d1b45db15cb51bbc9f754e
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
 EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
index 11152da..2c04ca2 100644
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -5,32 +5,32 @@
 
 # Path (or name) of UNIX/TCP socket to bind to
 #
-UWSGI_SOCKET=127.0.0.1:1234
+#UWSGI_SOCKET=127.0.0.1:1234
 
 # Enable threads?
 #
-UWSGI_THREADS=1
+#UWSGI_THREADS=1
 
 # The path to your uWSGI application.
 #
-UWSGI_PROGRAM=
+#UWSGI_PROGRAM=
 
 # The path to your uWSGI xml config file.
 #
-UWSGI_XML_CONFIG=
+#UWSGI_XML_CONFIG=
 
 # The number of child processes to spawn. The default is 1.
 #
-UWSGI_CHILDREN=1
+#UWSGI_CHILDREN=1
 
 # The log file path. If empty logging is disabled
 #
-UWSGI_LOG_FILE=
+#UWSGI_LOG_FILE=
 
 # If you want to run your application inside a chroot then specify the
 # directory here. Leave this blank otherwise.
 #
-UWSGI_CHROOT=
+#UWSGI_CHROOT=
 
 # If you want to run your application from a specific directiory specify
 # it here. Leave this blank otherwise.
@@ -40,7 +40,7 @@ UWSGI_CHROOT=
 # The user and group to run your application as. If you do not specify these,
 # the application will be run as root:root.
 #
-UWSGI_USER=
+#UWSGI_USER=
 
 # Additional options you might want to pass to uWSGI
 #

diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index aced947..64fb91b 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -30,7 +30,7 @@ start() {
 		return 1
 	fi
 
-	OPTIONS="--master --daemonize"
+	OPTIONS="--daemonize"
 
 	if [ -n "$UWSGI_LOG_FILE" ]; then
 		OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
@@ -69,6 +69,12 @@ start() {
 		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
 	fi
 
+    if [ -n "${EMPEROR_PATH}" ] ; then
+        OPTIONS="${OPTIONS} --emperor \"${EMPEROR_PATH}\""
+    else
+        OPTIONS="${OPTIONS} --master"
+    fi
+
 	ebegin "Starting uWSGI application ${PROGNAME}"
 	cd "${UWSGI_DIR}" && \
 	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"