From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnWGt-0006MJ-JS for garchives@archives.gentoo.org; Sun, 31 Jul 2011 13:41:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54D4621C090; Sun, 31 Jul 2011 13:41:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0E52521C090 for ; Sun, 31 Jul 2011 13:41:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AF121B4024 for ; Sun, 31 Jul 2011 13:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A9C253C004 for ; Sun, 31 Jul 2011 13:41:24 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <76c2dc75284b2ba0733cac17673ca8a399e54301.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/ X-VCS-Repository: dev/dev-zero X-VCS-Files: www-servers/uwsgi/Manifest www-servers/uwsgi/files/uwsgi.confd www-servers/uwsgi/files/uwsgi.initd X-VCS-Directories: www-servers/uwsgi/files/ www-servers/uwsgi/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: 76c2dc75284b2ba0733cac17673ca8a399e54301 Date: Sun, 31 Jul 2011 13:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8fbc3a342578442315536c5b1226ebb0 commit: 76c2dc75284b2ba0733cac17673ca8a399e54301 Author: Tiziano Mueller gentoo org> AuthorDate: Sun Jul 31 13:39:39 2011 +0000 Commit: Tiziano M=C3=BCller gentoo org> CommitDate: Sun Jul 31 13:39:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dev-zero.git;a= =3Dcommit;h=3D76c2dc75 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 418abb3d30490aae32336efcb= 4c27ee96af8a09f1f9bbfc629384efe8c2363a9 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db= 7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2= ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5= 545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe56= 0d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 -AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA= 1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77d= c3d131499e442526d5e45438b5461c0d7590b772f -AUX uwsgi.initd 2112 RMD160 cb71ca5b5f27c5ee918e02c0dd562e6b79ec7543 SHA= 1 fbfc9c17941962d917ab549108581b2e9d016217 SHA256 635f30cc4a414cbb50c96a5= 00432d2da35bfbb7ab715dce010783f0db7e2d9f0 +AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA= 1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134= b41d95205f585197828e5e0e2bccd475787fce0a7 +AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA= 1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c= 51b62f89c48126e1228d1b45db15cb51bbc9f754e MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SH= A1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba7465= 7f3a332c7427c1bd24a5609d2ff887f63901d9cd35 EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304d= ef8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367da= a297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828= b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408b= b4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/file= s/uwsgi.confd index 11152da..2c04ca2 100644 --- a/www-servers/uwsgi/files/uwsgi.confd +++ b/www-servers/uwsgi/files/uwsgi.confd @@ -5,32 +5,32 @@ =20 # Path (or name) of UNIX/TCP socket to bind to # -UWSGI_SOCKET=3D127.0.0.1:1234 +#UWSGI_SOCKET=3D127.0.0.1:1234 =20 # Enable threads? # -UWSGI_THREADS=3D1 +#UWSGI_THREADS=3D1 =20 # The path to your uWSGI application. # -UWSGI_PROGRAM=3D +#UWSGI_PROGRAM=3D =20 # The path to your uWSGI xml config file. # -UWSGI_XML_CONFIG=3D +#UWSGI_XML_CONFIG=3D =20 # The number of child processes to spawn. The default is 1. # -UWSGI_CHILDREN=3D1 +#UWSGI_CHILDREN=3D1 =20 # The log file path. If empty logging is disabled # -UWSGI_LOG_FILE=3D +#UWSGI_LOG_FILE=3D =20 # If you want to run your application inside a chroot then specify the # directory here. Leave this blank otherwise. # -UWSGI_CHROOT=3D +#UWSGI_CHROOT=3D =20 # If you want to run your application from a specific directiory specify # it here. Leave this blank otherwise. @@ -40,7 +40,7 @@ UWSGI_CHROOT=3D # The user and group to run your application as. If you do not specify t= hese, # the application will be run as root:root. # -UWSGI_USER=3D +#UWSGI_USER=3D =20 # Additional options you might want to pass to uWSGI # diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/file= s/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 =20 - OPTIONS=3D"--master --daemonize" + OPTIONS=3D"--daemonize" =20 if [ -n "$UWSGI_LOG_FILE" ]; then OPTIONS=3D"${OPTIONS} $UWSGI_LOG_FILE" @@ -69,6 +69,12 @@ start() { OPTIONS=3D"${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}" fi =20 + if [ -n "${EMPEROR_PATH}" ] ; then + OPTIONS=3D"${OPTIONS} --emperor \"${EMPEROR_PATH}\"" + else + OPTIONS=3D"${OPTIONS} --master" + fi + ebegin "Starting uWSGI application ${PROGNAME}" cd "${UWSGI_DIR}" && \ start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}"= -- ${OPTIONS} --pidfile "${PIDFILE}"