Skip to content

Commit ae794a8

Browse files
committed
cleanup modules, add log
1 parent 12ead6f commit ae794a8

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

Diff for: app/scripts/app.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ uid='www-data'
1717
gid='www-data'
1818

1919
# stating apps
20-
pip uninstall -y south
21-
pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
22-
pip install django-debug-toolbar==1.6
23-
pip install -e git+https://github.com/Parisson/[email protected]#egg=django-jqchat
24-
pip install -e git+https://github.com/Parisson/[email protected]#egg=saved_searches-2.0.0-beta
20+
# pip uninstall -y south
21+
# pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
22+
# pip install django-debug-toolbar==1.6
23+
# pip install -e git+https://github.com/Parisson/[email protected]#egg=django-jqchat
24+
# pip install -e git+https://github.com/Parisson/[email protected]#egg=saved_searches-2.0.0-beta
2525

2626
# waiting for other network services
2727
sh $app/scripts/wait.sh
@@ -61,5 +61,5 @@ else
6161
# app start
6262
uwsgi --socket :$port --wsgi-file $wsgi --chdir $app --master \
6363
--processes $processes --threads $threads \
64-
--uid $uid --gid $gid --touch-reload $wsgi
64+
--uid $uid --gid $gid --logto $log --touch-reload $wsgi
6565
fi

Diff for: app/scripts/worker.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ wsgi=$app'/wsgi.py'
77
concurrency=12
88

99
# stating apps
10-
pip uninstall -y south
11-
pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
12-
pip install django-debug-toolbar==1.6
13-
pip install -e git+https://github.com/Parisson/[email protected]#egg=django-jqchat
14-
pip install -e git+https://github.com/Parisson/[email protected]#egg=saved_searches-2.0.0-beta
10+
# pip uninstall -y south
11+
# pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
12+
# pip install django-debug-toolbar==1.6
13+
# pip install -e git+https://github.com/Parisson/[email protected]#egg=django-jqchat
14+
# pip install -e git+https://github.com/Parisson/[email protected]#egg=saved_searches-2.0.0-beta
1515

1616
# waiting for other services
1717
bash $app/scripts/wait.sh

Diff for: requirements-dev.txt

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
-e git+https://github.com/django-haystack/[email protected]#egg=django-haystack-2.5.1
66
-e git+https://github.com/yomguy/django-ipauth.git#egg=django-ipauth-0.4.1-dev
77
-e git+https://github.com/Parisson/[email protected]#egg=django-jqchat
8-

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ def run_tests(self):
5151
install_requires = [
5252
'django==1.8.*',
5353
'django-registration-redux',
54+
'djangorestframework==3.6.4',
5455
'django-extensions',
5556
'django-timezones',
56-
#'django-jqchat',
5757
'django-debug-toolbar==1.6',
5858
'django-extra-views',
5959
'django-breadcrumbs',

0 commit comments

Comments
 (0)