locust 2.28.1.dev45__tar.gz → 2.28.1.dev54__tar.gz

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.28.1.dev45
+Version: 2.28.1.dev54
 Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/docs/developing-locust.rst

@@ -1,8 +1,8 @@
 .. _developing-locust:
 
-=================
-Developing Locust
-=================
+=================================
+Developing and Documenting Locust
+=================================
 
 You want to contribute to Locust? Great! Here is a list of `open bugs/feature requests <https://github.com/locustio/locust/issues>`_.
 
@@ -72,19 +72,21 @@ You can validate the whole project using tox:
 Build documentation
 ===================
 
-The documentation source is in the `docs/ <https://github.com/locustio/locust/tree/master/docs/>`_ directory. To build the documentation you first need to install the required Python packages:
+The documentation source is in the `docs/ <https://github.com/locustio/locust/tree/master/docs/>`_ directory. To build the documentation you'll need to `Install Locust for development`_ then
 
-.. code-block:: console
+#. Install the documentation requirements:
 
-    $ pip3 install -r docs/requirements.txt
+    .. code-block:: console
 
-Then you can build the documentation locally using:
+        $ pip3 install -r docs/requirements.txt
 
-.. code-block:: console
+#. Build the documentation locally:
+
+    .. code-block:: console
 
-    $ make build_docs
+        $ make build_docs
     
-Then the documentation should be build and available at ``docs/_build/index.html``.
+View your generated documentation by opening ``docs/_build/index.html``.
 
 
 Making changes to Locust's Web UI

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.28.1.dev45'
-__version_tuple__ = version_tuple = (2, 28, 1, 'dev45')
+__version__ = version = '2.28.1.dev54'
+__version_tuple__ = version_tuple = (2, 28, 1, 'dev54')

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/locust/argument_parser.py

@@ -241,10 +241,18 @@ def download_locustfile_from_master(master_host: str, master_port: int) -> str:
             tempclient.send(Message("locustfile", None, client_id))
             gevent.sleep(1)
 
+    def log_warning():
+        gevent.sleep(10)
+        while not got_reply:
+            sys.stderr.write("Waiting to connect to master to receive locustfile...\n")
+            gevent.sleep(60)
+
     def wait_for_reply():
         return tempclient.recv()
 
     gevent.spawn(ask_for_locustfile)
+    gevent.spawn(log_warning)
+
     try:
         # wait same time as for client_ready ack. not that it is really relevant...
         msg = gevent.spawn(wait_for_reply).get(timeout=runners.CONNECT_TIMEOUT * runners.CONNECT_RETRY_COUNT)

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/locust/web.py

@@ -534,8 +534,8 @@ class WebUI:
             class RewriteFilter(logging.Filter):
                 def filter(self, record) -> bool:
                     msg = record.msg
-                    if msg.find("gevent._socket3.socket at") and msg.find("Invalid HTTP method: '\x16\x03"):
-                        record.msg = f"A request against Locust's Web UI was made using https:// instead of http:// (underlying error was {record.msg})"
+                    if "gevent._socket3.socket at" in msg and "Invalid HTTP method: '\x16\x03" in msg:
+                        record.msg = f"An https request was made against Locust's Web UI (which was expecting http). Underlying error was: {record.msg}"
                     return True
 
             logger.addFilter(RewriteFilter())

{locust-2.28.1.dev45 → locust-2.28.1.dev54}/locust.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.28.1.dev45
+Version: 2.28.1.dev54
 Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust