cleanup modules, add log

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 31bf488df9c5a65e0ec86e8cad39e9905755af40..6f5271e21d360ab1a11acf8fab8b7543cbadeb40 100755 (executable)
--- 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 bcfc9fa2d3b87251af3b35477ee18f03df3363c8..15ef8228fd6b3f4653eb9f04d9b153773e6abbad 100755 (executable)
--- 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 da45fa95aacc3d3228db2f35cc5b63695c2efe42..860b94c95995219f37e03c39100818ba2efe9701 100644 (file)
--- 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 e8e72e510a2afa45179e96e67b2db7805571fd2f..63ef8c636c73426aee1ad74ca8c366ac2a69c581 100644 (file)
--- 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',