From ae794a862f336581fc3e03669bc1b76cd0bb91e8 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 29 Jul 2018 21:37:05 +0200 Subject: [PATCH] cleanup modules, add log --- app/scripts/app.sh | 12 ++++++------ app/scripts/worker.sh | 10 +++++----- requirements-dev.txt | 1 - setup.py | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/scripts/app.sh b/app/scripts/app.sh index 31bf488d..6f5271e2 100755 --- a/app/scripts/app.sh +++ b/app/scripts/app.sh @@ -17,11 +17,11 @@ uid='www-data' gid='www-data' # stating apps -pip uninstall -y south -pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4 -pip install django-debug-toolbar==1.6 -pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat -pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta +# pip uninstall -y south +# pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4 +# pip install django-debug-toolbar==1.6 +# pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat +# pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta # waiting for other network services sh $app/scripts/wait.sh @@ -61,5 +61,5 @@ else # app start uwsgi --socket :$port --wsgi-file $wsgi --chdir $app --master \ --processes $processes --threads $threads \ - --uid $uid --gid $gid --touch-reload $wsgi + --uid $uid --gid $gid --logto $log --touch-reload $wsgi fi diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh index bcfc9fa2..15ef8228 100755 --- a/app/scripts/worker.sh +++ b/app/scripts/worker.sh @@ -7,11 +7,11 @@ wsgi=$app'/wsgi.py' concurrency=12 # stating apps -pip uninstall -y south -pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4 -pip install django-debug-toolbar==1.6 -pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat -pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta +# pip uninstall -y south +# pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4 +# pip install django-debug-toolbar==1.6 +# pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat +# pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta # waiting for other services bash $app/scripts/wait.sh diff --git a/requirements-dev.txt b/requirements-dev.txt index da45fa95..860b94c9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,4 +5,3 @@ -e git+https://github.com/django-haystack/django-haystack.git@v2.5.1#egg=django-haystack-2.5.1 -e git+https://github.com/yomguy/django-ipauth.git#egg=django-ipauth-0.4.1-dev -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat - diff --git a/setup.py b/setup.py index e8e72e51..63ef8c63 100644 --- a/setup.py +++ b/setup.py @@ -51,9 +51,9 @@ setup( install_requires = [ 'django==1.8.*', 'django-registration-redux', + 'djangorestframework==3.6.4', 'django-extensions', 'django-timezones', - #'django-jqchat', 'django-debug-toolbar==1.6', 'django-extra-views', 'django-breadcrumbs', -- 2.39.5