diff --git a/manage.py b/manage.py index 3e4eedc..17696b7 100644 --- a/manage.py +++ b/manage.py @@ -1,14 +1,9 @@ #!/usr/bin/env python -from django.core.management import execute_manager -import imp -try: - imp.find_module('settings') # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__) - sys.exit(1) - -import settings +import os, sys if __name__ == "__main__": - execute_manager(settings) + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "stacktach.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/settings.py b/settings.py index 01da733..5bd6cf1 100644 --- a/settings.py +++ b/settings.py @@ -139,6 +139,8 @@ INSTALLED_APPS = ( 'stacktach', ) +ALLOWED_HOSTS = ['*'] + # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to # the site admins on every HTTP 500 error. diff --git a/worker/stacktach.sh b/worker/stacktach.sh index 16794fa..271078b 100755 --- a/worker/stacktach.sh +++ b/worker/stacktach.sh @@ -1,4 +1,14 @@ -#!/bin/bash +#!/bin/sh +### BEGIN INIT INFO +# Provides: stacktach +# Required-Start: +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop stacktach workers +### END INIT INFO + +. /lib/lsb/init-functions WORKDIR=/srv/www/stacktach/app DAEMON=/usr/bin/python @@ -9,16 +19,24 @@ export DJANGO_SETTINGS_MODULE="settings" case "$1" in start) - echo "Starting server" + echo "Starting stacktach workers" cd $WORKDIR /sbin/start-stop-daemon --start --pidfile $PIDFILE --make-pidfile -b --exec $DAEMON $ARGS ;; stop) - echo "Stopping server" + echo "Stopping stacktach workers" /sbin/start-stop-daemon --stop --pidfile $PIDFILE --verbose ;; + restart) + echo "Restarting stacktach workers" + /sbin/start-stop-daemon --stop --pidfile $PIDFILE --retry 5 + /sbin/start-stop-daemon --start --pidfile $PIDFILE --make-pidfile -b --exec $DAEMON $ARGS + ;; + status) + status_of_proc "$DAEMON" "stacktach" && exit 0 || exit $? + ;; *) - echo "Usage: stacktach.sh {start|stop}" + echo "Usage: stacktach.sh {start|stop|restart|status}" exit 1 ;; esac