perso/syncserver
perso/syncserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use gunicorn rather than pserve

Browse Source
This commit is contained in:
Ryan Kelly 2015-05-12 17:25:13 +10:00
parent c4c0fa033a
commit 4a9cebf056
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -32,7 +32,7 @@ test: | $(TOOLS)
# $(ENV)/bin/nosetests -s tokenserver.tests # $(ENV)/bin/nosetests -s tokenserver.tests
# Test against a running server # Test against a running server
$(ENV)/bin/pserve syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \ $(ENV)/bin/gunicorn --paste syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
sleep 2; \ sleep 2; \
$(ENV)/bin/python -m syncstorage.tests.functional.test_storage \ $(ENV)/bin/python -m syncstorage.tests.functional.test_storage \
--use-token-server http://localhost:5000/token/1.0/sync/1.5; \ --use-token-server http://localhost:5000/token/1.0/sync/1.5; \
@ -43,7 +43,7 @@ $(TOOLS): | $(ENV)/COMPLETE
.PHONY: serve .PHONY: serve
serve: | $(ENV)/COMPLETE serve: | $(ENV)/COMPLETE
$(ENV)/bin/pserve ./syncserver.ini $(ENV)/bin/gunicorn --paste ./syncserver.ini
.PHONY: clean .PHONY: clean
clean: clean:

4
syncserver.ini
View File

@ -1,7 +1,9 @@
[server:main] [server:main]
use = egg:Paste#http use = egg:gunicorn
host = 0.0.0.0 host = 0.0.0.0
port = 5000 port = 5000
workers = 1
timeout = 30
[app:main] [app:main]
use = egg:syncserver use = egg:syncserver

4
syncserver/tests.ini
View File

@ -1,7 +1,9 @@
[server:main] [server:main]
use = egg:Paste#http use = egg:gunicorn
host = 0.0.0.0 host = 0.0.0.0
port = 5000 port = 5000
workers = 1
timeout = 30
[app:main] [app:main]
use = egg:SyncServer use = egg:SyncServer