locust 2.31.7.dev23__py3-none-any.whl → 2.31.8__py3-none-any.whl

locust/_version.py

@@ -14,7 +14,7 @@ __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
 
-__version__ = "2.31.7.dev23"
+__version__ = "2.31.8"
 version = __version__
-__version_tuple__ = (2, 31, 7, "dev23")
+__version_tuple__ = (2, 31, 8)
 version_tuple = __version_tuple__

locust/main.py

@@ -5,6 +5,7 @@ import locust
 import atexit
 import errno
 import gc
+import importlib.metadata
 import inspect
 import json
 import logging
@@ -44,7 +45,10 @@ except ModuleNotFoundError as e:
         raise
 try:
     import locust_cloud  # pyright: ignore[reportMissingImports]
+
+    locust_cloud_version = f" (locust-cloud {importlib.metadata.version('locust-cloud')})"
 except ModuleNotFoundError as e:
+    locust_cloud_version = ""
     if e.msg != "No module named 'locust_cloud'":
         raise
 
@@ -200,7 +204,8 @@ def main():
 
     children = []
     logger = logging.getLogger(__name__)
-    logger.info(f"Starting Locust {version}")
+
+    logger.info(f"Starting Locust {version}{locust_cloud_version}")
 
     if options.processes:
         if os.name == "nt":

locust/runners.py

@@ -1019,7 +1019,7 @@ class MasterRunner(DistributedRunner):
                         # TODO: Test this situation
                         self.start(self.target_user_count, self.spawn_rate)
                 logger.info(
-                    f"Worker {client_id} (index {self.get_worker_index(client_id)}) reported as ready. {len(self.clients.ready + self.clients.running + self.clients.spawning)} workers connected."
+                    f"{client_id} (index {self.get_worker_index(client_id)}) reported as ready. {len(self.clients.ready + self.clients.running + self.clients.spawning)} workers connected."
                 )
                 if self.rebalancing_enabled() and self.state == STATE_RUNNING and self.spawning_completed:
                     self.start(self.target_user_count, self.spawn_rate)
@@ -1079,9 +1079,7 @@ class MasterRunner(DistributedRunner):
                     if not self._users_dispatcher.dispatch_in_progress and self.state == STATE_RUNNING:
                         # TODO: Test this situation
                         self.start(self.target_user_count, self.spawn_rate)
-                logger.info(
-                    f"Worker {msg.node_id} (index {self.get_worker_index(client_id)}) reported that it has stopped, removing from running workers"
-                )
+                logger.info(f"{msg.node_id} (index {self.get_worker_index(client_id)}) reported that it has stopped")
             elif msg.type == "heartbeat":
                 if msg.node_id in self.clients:
                     c = self.clients[msg.node_id]

locust/web.py

@@ -629,7 +629,7 @@ class WebUI:
             else None
         )
 
-        self.template_args = {
+        new_template_args = {
             "locustfile": self.environment.locustfile,
             "state": self.environment.runner.state,
             "is_distributed": is_distributed,
@@ -658,6 +658,8 @@ class WebUI:
             "percentiles_to_statistics": stats_module.PERCENTILES_TO_STATISTICS,
         }
 
+        self.template_args = {**self.template_args, **new_template_args}
+
     def _update_shape_class(self, shape_class_name):
         if shape_class_name:
             shape_class = self.environment.available_shape_classes[shape_class_name]