From: Brett Smith <brettcsmith@brettcsmith.org>
Date: Sun, 18 Mar 2012 02:33:08 +0000 (-0400)
Subject: Refactor lazyserver.sh to lazystarter.sh and provide lazycelery.sh (#270)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e4df2fc5b303b2898af7a89c55514499a03a2823;p=mediagoblin.git

Refactor lazyserver.sh to lazystarter.sh and provide lazycelery.sh (#270)

Bug #270 asks for a lazycelery.sh script much like lazyserver.sh.  Rather
than duplicate the code, I consolidated them into a single script,
lazystarter.sh.  The script reconfigures itself a bit, and runs a
particular server, based on the name that's used to call it, but no matter
what it uses the same code to offer help and find configuration files and
server launchers.  Hopefully this will make it easy to add other
features/fix bugs as needed in the future, and have them stay in sync.
---

diff --git a/lazycelery.sh b/lazycelery.sh
new file mode 120000
index 00000000..4ff15b1d
--- /dev/null
+++ b/lazycelery.sh
@@ -0,0 +1 @@
+lazystarter.sh
\ No newline at end of file
diff --git a/lazyserver.sh b/lazyserver.sh
deleted file mode 100755
index 843993e6..00000000
--- a/lazyserver.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# 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/>.
-
-#
-# This runs Mediagoblin using Paste with Celery set to always eager mode.
-# 
-
-if [ "$1" = "-h" ]
-then
-    echo "$0 [-h] [-c paste.ini] [ARGS_to_paster ...]"
-    echo ""
-    echo "   For example:"
-    echo "         $0 -c fcgi.ini port_number=23371"
-    echo "     or: $0 --server-name=fcgi --log-file=paste.log"
-    echo ""
-    echo "   The configfile defaults to paste_local.ini,"
-    echo "   if that is readable, otherwise paste.ini."
-    exit 1
-fi
-
-PASTE_INI=paste.ini
-
-if [ -r paste_local.ini ]
-then
-    PASTE_INI=paste_local.ini
-fi
-
-if [ "$1" = "-c" ]
-then
-    PASTE_INI="$2"
-    shift
-    shift
-fi
-
-echo "Using paste config: $PASTE_INI"
-
-if [ -f ./bin/paster ]; then
-    echo "Using ./bin/paster";
-    export PASTER="./bin/paster";
-elif which paster > /dev/null; then
-    echo "Using paster from \$PATH";
-    export PASTER="paster";
-else
-    echo "No paster found, exiting! X_X";
-    exit 1
-fi
-
-set -x
-CELERY_ALWAYS_EAGER=true $PASTER serve $PASTE_INI "$@" --reload
diff --git a/lazyserver.sh b/lazyserver.sh
new file mode 120000
index 00000000..4ff15b1d
--- /dev/null
+++ b/lazyserver.sh
@@ -0,0 +1 @@
+lazystarter.sh
\ No newline at end of file
diff --git a/lazystarter.sh b/lazystarter.sh
new file mode 100755
index 00000000..d3770194
--- /dev/null
+++ b/lazystarter.sh
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+selfname=$(basename "$0")
+local_bin="./bin"
+case "$selfname" in
+    lazyserver.sh)
+        starter_cmd=paster
+        ini_prefix=paste
+        ;;
+    lazycelery.sh)
+        starter_cmd=celeryd
+        ini_prefix=mediagoblin
+        ;;
+    *)
+        echo "Start this script with the name lazyserver.sh or lazycelery.sh">&2
+        exit 1
+        ;;
+esac
+
+if [ "$1" = "-h" ]; then
+    echo "$0 [-h] [-c filename.ini] [ARGS_to_${starter_cmd} ...]"
+    echo ""
+    echo "   For example:"
+    echo "         $0 -c fcgi.ini port_number=23371"
+    echo "     or: $0 --server-name=fcgi --log-file=paste.log"
+    echo ""
+    echo "   The configfile defaults to ${ini_prefix}_local.ini,"
+    echo "   if that is readable, otherwise ${ini_prefix}.ini."
+    exit 1
+fi
+
+if [ "$1" = "-c" ]; then
+    ini_file=$2
+    shift; shift
+elif [ -r "${ini_prefix}_local.ini" ]; then
+    ini_file="${ini_prefix}_local.ini"
+else
+    ini_file="${ini_prefix}.ini"
+fi
+
+echo "Using ${starter_cmd} config: ${ini_file}"
+
+if [ -f "${local_bin}/${starter_cmd}" ]; then
+    echo "Using ${local_bin}/${starter_cmd}"
+    starter="${local_bin}/${starter_cmd}"
+elif which "${starter_cmd}" > /dev/null; then
+    echo "Using ${starter_cmd} from \$PATH"
+    starter=$starter_cmd
+else
+    echo "No ${starter_cmd} found, exiting! X_X"
+    exit 1
+fi
+
+set -x
+export CELERY_ALWAYS_EAGER=true
+case "$selfname" in
+    lazyserver.sh)
+        $starter serve "$ini_file" "$@" --reload
+        ;;
+    lazycelery.sh)
+        MEDIAGOBLIN_CONFIG="${ini_file}" \
+            CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery \
+            $starter "$@"
+        ;;
+    *) exit 1 ;;
+esac