From 27cd204f9ea0adb74dc78980302cf8caa91063a0 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 16:45:48 -0400 Subject: [PATCH 01/13] Create uswgi2.ini --- uswgi2.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 uswgi2.ini diff --git a/uswgi2.ini b/uswgi2.ini new file mode 100644 index 0000000..9aa0d77 --- /dev/null +++ b/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 +spooler = /tmp/isso/mail +module = isso.dispatch +; uncomment if you use a virtual environment +; virtualenv = /path/to/isso +env = ISSO_SETTINGS=/path/to/isso.cfg From 98448a38565d609bf81e1aa5d1de0c1acd2cff44 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 16:46:44 -0400 Subject: [PATCH 02/13] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7496fc4..fb1e8a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -gunicorn==19.7.1 +uswgi=2.0.17 From 646070ea931abd039a83e29dc6b46cfb18d7f10f Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 16:47:24 -0400 Subject: [PATCH 03/13] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0eaf530..da5cdec 100644 --- a/Makefile +++ b/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 + uswgi uswgi2.ini .PHONY: clean site man init js coverage test web From 3ec71d619712bf48fb232178e4be398078a91bad Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 16:49:05 -0400 Subject: [PATCH 04/13] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fb1e8a0..559ffaa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -uswgi=2.0.17 +uswgi==2.0.17 From b76f0ea5c4cd664e32558dd73fbbd46095908528 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:00:28 -0400 Subject: [PATCH 05/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index da5cdec..11e869c 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ 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 - uswgi uswgi2.ini + /usr/local/bin/uwsgi uswgi2.ini .PHONY: clean site man init js coverage test web From 1be071cdfd280cc182dd0d6aa54ec012d5e19684 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:04:57 -0400 Subject: [PATCH 06/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ef866fe..c44b92d 100644 --- a/setup.py +++ b/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.") From d43a185787896ec187e6bcb6272ca501a2a7439b Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:05:09 -0400 Subject: [PATCH 07/13] Delete requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 559ffaa..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -uswgi==2.0.17 From cab9c3a72b8d70482da6d7d9bd2da349519a70c9 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:08:10 -0400 Subject: [PATCH 08/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 11e869c..778c223 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ 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 - /usr/local/bin/uwsgi uswgi2.ini + uwsgi uswgi2.ini .PHONY: clean site man init js coverage test web From fd5b29d207e29bd1b00fa8aafbab78f5f82dde7b Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:11:34 -0400 Subject: [PATCH 09/13] Update uswgi2.ini --- uswgi2.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/uswgi2.ini b/uswgi2.ini index 9aa0d77..9d0e175 100644 --- a/uswgi2.ini +++ b/uswgi2.ini @@ -5,7 +5,6 @@ master = true processes = 4 cache2 = name=hash,items=1024,blocksize=32 ; you may change this -spooler = /tmp/isso/mail module = isso.dispatch ; uncomment if you use a virtual environment ; virtualenv = /path/to/isso From 8cd16a944b643843e2a79f9e8cf2701b187d6f1a Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:13:07 -0400 Subject: [PATCH 10/13] Update uswgi2.ini --- uswgi2.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/uswgi2.ini b/uswgi2.ini index 9d0e175..0abd795 100644 --- a/uswgi2.ini +++ b/uswgi2.ini @@ -8,4 +8,3 @@ cache2 = name=hash,items=1024,blocksize=32 module = isso.dispatch ; uncomment if you use a virtual environment ; virtualenv = /path/to/isso -env = ISSO_SETTINGS=/path/to/isso.cfg From d1a36945c2d36f9688e7751646d861eb1d1776a3 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:19:31 -0400 Subject: [PATCH 11/13] Update uswgi2.ini --- uswgi2.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/uswgi2.ini b/uswgi2.ini index 0abd795..754cb89 100644 --- a/uswgi2.ini +++ b/uswgi2.ini @@ -6,5 +6,6 @@ processes = 4 cache2 = name=hash,items=1024,blocksize=32 ; you may change this module = isso.dispatch +touch-reload = /app/storage/uwsgi-reload.ini ; uncomment if you use a virtual environment ; virtualenv = /path/to/isso From 0f6276581b61ec217985005cf4940398e2173bb3 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:25:13 -0400 Subject: [PATCH 12/13] Update uswgi2.ini --- uswgi2.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uswgi2.ini b/uswgi2.ini index 754cb89..7e803ce 100644 --- a/uswgi2.ini +++ b/uswgi2.ini @@ -6,6 +6,6 @@ processes = 4 cache2 = name=hash,items=1024,blocksize=32 ; you may change this module = isso.dispatch -touch-reload = /app/storage/uwsgi-reload.ini +touch-chain-reload = /app/storage/uwsgi-reload.ini ; uncomment if you use a virtual environment ; virtualenv = /path/to/isso From f668dbf28f2b97a8748813924070e0350873c662 Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Sun, 15 Apr 2018 17:29:51 -0400 Subject: [PATCH 13/13] Update uswgi2.ini --- uswgi2.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/uswgi2.ini b/uswgi2.ini index 7e803ce..1ff2ad2 100644 --- a/uswgi2.ini +++ b/uswgi2.ini @@ -6,6 +6,7 @@ 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