Skip to content

Commit

Permalink
Run python executables directly, instead of in the venv dir
Browse files Browse the repository at this point in the history
  • Loading branch information
mjumbewu authored and JoshData committed Jun 5, 2017
1 parent c6d9c57 commit a583118
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion minify
@@ -1,2 +1,2 @@
#!/bin/bash
.env/bin/python -mrcssmin < static/css/all.css > static/css/all-min.css
python -m rcssmin < static/css/all.css > static/css/all-min.css
2 changes: 1 addition & 1 deletion script
@@ -1,5 +1,5 @@
#!/bin/sh
DJANGO_SETTINGS_MODULE=settings PYTHONPATH=. .env/bin/python -u -W ignore /dev/stdin "$@" << EOF;
DJANGO_SETTINGS_MODULE=settings PYTHONPATH=. python -u -W ignore /dev/stdin "$@" << EOF;
import django
django.setup()
Expand Down
4 changes: 2 additions & 2 deletions uwsgi.sh
Expand Up @@ -32,7 +32,7 @@ if [[ "$1" = "stop" && -e $pidfile ]]; then
echo "Stopping..."
pid=$(cat $pidfile)
kill -QUIT $pid

# Wait till it actually exists.
while kill -0 $pid 2> /dev/null;
do
Expand Down Expand Up @@ -67,4 +67,4 @@ if [ -z "$DEBUG" ]; then
daemonize="--daemonize /dev/null --pidfile $pidfile --processes $PROCESSES --cheaper 2"
fi

.env/bin/uwsgi $daemonize --socket /tmp/uwsgi_govtrack_$NAME.sock --chmod-socket=666 --wsgi-file wsgi.py
uwsgi $daemonize --socket /tmp/uwsgi_govtrack_$NAME.sock --chmod-socket=666 --wsgi-file wsgi.py

0 comments on commit a583118

Please sign in to comment.