heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update lazyserver to use paste or gunicorn conditionally

Browse Source 
Also get rid of env.in, we're not using that for now.
This commit is contained in:
Christopher Allan Webber 2014-10-09 13:49:15 -05:00
parent 1da574c6c9
commit 41c6732eff
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,6 +29,7 @@
/env /env
/paste.ini /paste.ini
/mediagoblin.ini /mediagoblin.ini
/lazystarter.sh
# pyconfigure/automake generated files # pyconfigure/automake generated files
/Makefile /Makefile

6
configure.ac
View File

@ -80,12 +80,12 @@ AC_ARG_WITH([python3],
[with_python3=no]) [with_python3=no])
AS_IF([test "x$with_python3" != xno], AS_IF([test "x$with_python3" != xno],
AC_CHECK_PROGS([PYTHON], [python3.3], [none]) AC_CHECK_PROGS([PYTHON], [python3.3], [none])
AC_SUBST([USE_PYTHON3], [yes]) AC_SUBST([USE_PYTHON3], [true])
AS_IF([test "x$PYTHON" = xnone], AS_IF([test "x$PYTHON" = xnone],
[AC_MSG_FAILURE( [AC_MSG_FAILURE(
[--with-python3 given but no acceptable python3 (3.3) could be found])]), [--with-python3 given but no acceptable python3 (3.3) could be found])]),
AC_CHECK_PROGS([PYTHON], [python2.7 python2.6], [none]) AC_CHECK_PROGS([PYTHON], [python2.7 python2.6], [none])
AC_SUBST([USE_PYTHON3], [no]) AC_SUBST([USE_PYTHON3], [false])
AS_IF([test "x$PYTHON" = xnone], AS_IF([test "x$PYTHON" = xnone],
[AC_MSG_FAILURE( [AC_MSG_FAILURE(
[No acceptable python (2.7, 2.6) could be found])])) [No acceptable python (2.7, 2.6) could be found])]))
@ -435,7 +435,7 @@ dnl#########
dnl Define the files to be configured dnl Define the files to be configured
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([env], [chmod +x env]) AC_CONFIG_FILES([lazystarter.sh], [chmod +x lazystarter.sh])
dnl Generate config.status dnl Generate config.status
AC_OUTPUT AC_OUTPUT

4
env.in
View File

@ -1,4 +0,0 @@
#!/bin/sh
our_python=@PYTHON@

14
lazystarter.sh → lazystarter.sh.in Executable file → Normal file
View File

@ -16,11 +16,17 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
use_python3=@USE_PYTHON3@
selfname=$(basename "$0") selfname=$(basename "$0")
local_bin="./bin" local_bin="./bin"
case "$selfname" in case "$selfname" in
lazyserver.sh) lazyserver.sh)
starter_cmd=gunicorn if $use_python3; then
starter_cmd=gunicorn;
else
starter_cmd=paster;
fi
ini_prefix=paste ini_prefix=paste
;; ;;
lazycelery.sh) lazycelery.sh)
@ -70,7 +76,11 @@ set -x
export CELERY_ALWAYS_EAGER=true export CELERY_ALWAYS_EAGER=true
case "$selfname" in case "$selfname" in
lazyserver.sh) lazyserver.sh)
$starter --paste "$ini_file" --log-file=- $@ if $use_python3; then
$starter --paste "$ini_file" --log-file=- $@;
else
$starter serve "$ini_file" "$@" --reload;
fi
;; ;;
lazycelery.sh) lazycelery.sh)
MEDIAGOBLIN_CONFIG="${ini_file}" \ MEDIAGOBLIN_CONFIG="${ini_file}" \