Merge pull request #650 from mbeacom/switch-wsgi-libs

Modify gevent wsgi and libev dependencies

.travis.yml

@@ -15,7 +15,7 @@ matrix:
 addons:
   apt:
     packages:
-      - libevent-dev
+      - libev-dev
 install:
   - pip install tox
 script:

docs/installation.rst

@@ -59,9 +59,9 @@ Installing Locust on OS X
 The following is currently the shortest path to installing gevent on OS X using Homebrew.
 
 #. Install `Homebrew <http://mxcl.github.com/homebrew/>`_.
-#. Install libevent (dependency for gevent)::
+#. Install libev (dependency for gevent)::
 
-    brew install libevent
+    brew install libev
 
 #. Then follow the above instructions.
 

examples/vagrant/vagrant.sh

@@ -6,7 +6,7 @@
 
 # Update and install some dependencies
 apt-get -y update 
-apt-get -y install build-essential python-pip python-dev libevent-dev libev-dev libzmq-dev
+apt-get -y install build-essential python-pip python-dev libev-dev libzmq-dev
 cd /vagrant
 
 pip install --use-mirrors pyzmq supervisor

locust/web.py

@@ -10,7 +10,7 @@
 
 import six
 from flask import Flask, make_response, render_template, request
-from gevent import wsgi
+from gevent import pywsgi
 
 from locust import __version__ as version
 from six.moves import StringIO, xrange
@@ -176,4 +176,5 @@ def exceptions_csv():
     return response
 
 def start(locust, options):
-    wsgi.WSGIServer((options.web_host, options.port), app, log=None).serve_forever()
+    pywsgi.WSGIServer((options.web_host, options.port),
+                      app, log=None).serve_forever()