Merge branch 'master' of https://github.com/chrishutchison9/commentsh-isso

Makefile

@@ -73,8 +73,8 @@ clean:
 web:
 	python setup.py develop  # or `install`
 	# isso -c config/comments.comment.sh.cfg run
-	gunicorn --pid=/app/storage/gunicorn.pid -w 4 -b 0.0.0.0:5000  isso.dispatch
-
+	# gunicorn --pid=/app/storage/gunicorn.pid -w 4 -b 0.0.0.0:5000  isso.dispatch
+	uwsgi uswgi2.ini
 
 .PHONY: clean site man init js coverage test web
 

requirements.txt

@@ -1 +0,0 @@
-gunicorn==19.7.1

setup.py

@@ -6,7 +6,7 @@ import sys
 from setuptools import setup, find_packages
 
 requires = ['html5lib==0.9999999', 'itsdangerous', 'Jinja2',
-            'misaka>=1.0,<2.0', 'werkzeug>=0.9']
+            'misaka>=1.0,<2.0', 'werkzeug>=0.9', 'uwsgi']
 
 if sys.version_info < (2, 7):
     raise SystemExit("Python 2 versions < 2.7 are not supported.")

uswgi2.ini

@@ -0,0 +1,12 @@
+[uwsgi]
+http = :5000
+master = true
+; set to `nproc`
+processes = 4
+cache2 = name=hash,items=1024,blocksize=32
+; you may change this
+module = isso.dispatch
+lazy-apps = true
+touch-chain-reload = /app/storage/uwsgi-reload.ini
+; uncomment if you use a virtual environment
+; virtualenv = /path/to/isso