Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify gevent wsgi and libev dependencies #650

Merged
merged 2 commits into from
Sep 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ matrix:
addons:
apt:
packages:
- libevent-dev
- libev-dev
install:
- pip install tox
script:
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion examples/vagrant/vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions locust/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()