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.

Sign up for GitHub

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

Merge locustio #14

Merged
merged 7 commits into from
Jun 28, 2018
Merged

Merge locustio #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fce34ad
Update third-party-tools.rst
anhldbk May 29, 2018
89f7b19
Update third-party-tools.rst
anhldbk May 30, 2018
9d2b5a0
Update third-party-tools.rst
anhldbk May 30, 2018
7ace2e5
Update all pypi.python.org URLs to pypi.org (#818)
jdufresne Jun 10, 2018
61b43c7
Fix some typos in events.py (#820)
felixonmars Jun 14, 2018
98f213a
Merge pull request #808 from anhldbk/master
aldenpeterson-wf Jun 25, 2018
eb89fe8
Merge branch 'master' of github.com:locustio/locust into merge-locustio
Jun 28, 2018
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![Build Status](https://img.shields.io/travis/locustio/locust.svg)](https://travis-ci.org/locustio/locust)
[![codecov](https://codecov.io/gh/locustio/locust/branch/master/graph/badge.svg)](https://codecov.io/gh/locustio/locust)
[![license](https://img.shields.io/github/license/locustio/locust.svg)](https://github.com/locustio/locust/blob/master/LICENSE)
[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.python.org/pypi/locustio)
[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.python.org/pypi/locustio)
[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.org/project/locustio/)
[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.org/project/locustio/)
[![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors)

## Links
Expand Down
10 changes: 6 additions & 4 deletions docs/third-party-tools.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ supported by many languages. So, you can write your Locust tasks in any language
libraries do the job as a slave runner. They run your Locust tasks, and report to master regularly.


Boomer (Golang)
Golang
---------------

`Boomer <https://github.com/myzhan/boomer/>`_ is a Locust slave runner written in golang.
- `Boomer <https://github.com/myzhan/boomer/>`_

Locust4j (Java)
Java
---------------

`Locust4j <https://github.com/myzhan/locust4j>`_ is a Locust slave runner written in Java.
- `Locust4j <https://github.com/myzhan/locust4j>`_

- `Swarm <https://github.com/anhldbk/swarm>`_
4 changes: 2 additions & 2 deletions locust/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ def fire(self, reverse=False, **kwargs):
"""
*master_start_hatching* is fired when we initiate the hatching process on the master.

This event is especially usefull to detect when the 'start' button is clicked on the web ui.
This event is especially useful to detect when the 'start' button is clicked on the web ui.
"""

master_stop_hatching = EventHook()
"""
*master_stop_hatching* is fired when terminate the hatching process on the master.

This event is especially usefull to detect when the 'stop' button is clicked on the web ui.
This event is especially useful to detect when the 'stop' button is clicked on the web ui.
"""

locust_start_hatching = EventHook()
Expand Down