locust 2.46.8.dev32__tar.gz → 2.46.8.dev43__tar.gz

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.8.dev32
+Version: 2.46.8.dev43
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.8.dev32'
-__version_tuple__ = version_tuple = (2, 46, 8, 'dev32')
+__version__ = version = '2.46.8.dev43'
+__version_tuple__ = version_tuple = (2, 46, 8, 'dev43')
 
 __commit_id__ = commit_id = None

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/contrib/milvus.py

@@ -284,7 +284,7 @@ class MilvusUser(User):
         Milvus server URI, e.g. ``"http://localhost:19530"``.
     collection_name : str
         The name of the collection to operate on.
-    **client_kwargs
+    ``**client_kwargs``
         Additional keyword arguments forwarded to the client.
     """
 

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/contrib/qdrant.py

@@ -148,9 +148,9 @@ class QdrantUser(User):
         Qdrant server URL, e.g. ``"http://localhost:6333"``.
     collection_name : str
         The name of the collection to operate on.
-    **client_kwargs
+    ``**client_kwargs``
         Additional keyword arguments forwarded to the client.
-    **collection_kwargs
+    ``**collection_kwargs``
         Additional keyword arguments forwarded to ``create_collection``.
     """
 

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/log.py

@@ -1,5 +1,6 @@
 import logging
 import logging.config
+import os
 import re
 import socket
 from collections import deque
@@ -63,6 +64,8 @@ def setup_logging(loglevel, logfile=None):
         },
     }
     if logfile:
+        if logfile_dir := os.path.dirname(logfile):
+            os.makedirs(logfile_dir, exist_ok=True)
         # if a file has been specified add a file logging handler and set
         # the locust and root loggers to use it
         LOGGING_CONFIG["handlers"]["file"] = {

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/main.py

@@ -434,10 +434,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
             logger.debug("--run-time specified for a worker node will be ignored.")
 
     if options.csv_prefix:
-        base_csv_file = os.path.basename(options.csv_prefix)
-        base_csv_dir = options.csv_prefix[: -len(base_csv_file)]
-        if not os.path.exists(base_csv_dir) and len(base_csv_dir) != 0:
-            os.makedirs(base_csv_dir)
+        if base_csv_dir := os.path.dirname(options.csv_prefix):
+            os.makedirs(base_csv_dir, exist_ok=True)
         stats_csv_writer = stats.StatsCSVFileWriter(
             environment, stats.PERCENTILES_TO_REPORT, options.csv_prefix, options.stats_history_enabled
         )
@@ -660,6 +658,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         if options.json:
             stats.print_stats_json(runner.stats)
         if options.json_file:
+            if json_dir := os.path.dirname(options.json_file):
+                os.makedirs(json_dir, exist_ok=True)
             stats.save_stats_json(runner.stats, options.json_file)
         elif not isinstance(runner, locust.runners.WorkerRunner):
             stats.print_stats(runner.stats, current=False)
@@ -679,6 +679,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         html_report = get_html_report(environment, show_download_link=False)
         process_html_filename(options)
         logger.debug("Writing html report to file: %s", options.html_file)
+        if html_dir := os.path.dirname(options.html_file):
+            os.makedirs(html_dir, exist_ok=True)
         with open(options.html_file, "w", encoding="utf-8") as file:
             file.write(html_report)
 

{locust-2.46.8.dev32 → locust-2.46.8.dev43}/locust/runners.py

@@ -32,6 +32,7 @@ from .exception import RPCError, RPCReceiveError, RPCSendError, StopTest
 from .log import get_logs, greenlet_exception_logger
 from .rpc import Message, rpc
 from .stats import RequestStats, StatsError, setup_distributed_stats_event_listeners
+from .user.task import LOCUST_STATE_STOPPING
 from .util.directory import get_abspaths_in
 from .util.url import is_url
 
@@ -276,7 +277,9 @@ class Runner:
                     # User called runner.quit(), so don't block waiting for killing to finish
                     user_to_stop.group.killone(user_to_stop.greenlet, block=False)
                 elif self.environment.stop_timeout:
-                    async_calls_to_stop.add(gevent.spawn_later(0, user_to_stop.stop, force=False))
+                    # a user that a ramp-down already asked to stop is only waited for, stopping it again raises
+                    if user_to_stop._state != LOCUST_STATE_STOPPING:
+                        async_calls_to_stop.add(gevent.spawn_later(0, user_to_stop.stop, force=False))
                     stop_group.add(user_to_stop.greenlet)
                 else:
                     async_calls_to_stop.add(gevent.spawn_later(0, user_to_stop.stop, force=True))
@@ -1446,10 +1449,13 @@ class WorkerRunner(DistributedRunner):
             case _ if lc := self.custom_messages.get(msg.type):
                 listener, concurrent = lc
                 logger.debug(f"Received {msg.type} message from master")
-                if not concurrent:
-                    listener(environment=self.environment, msg=msg)
-                else:
-                    gevent.spawn(listener, self.environment, msg)
+                try:
+                    if not concurrent:
+                        listener(environment=self.environment, msg=msg)
+                    else:
+                        gevent.spawn(listener, environment=self.environment, msg=msg)
+                except Exception:
+                    logging.error(f"Uncaught exception in handler for {msg.type}\n{traceback.format_exc()}")
             case _:
                 logger.warning(f"Unknown message type received: {msg.type}")