locust 2.27.1.dev20__py3-none-any.whl → 2.27.1.dev29__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.27.1.dev20'
-__version_tuple__ = version_tuple = (2, 27, 1, 'dev20')
+__version__ = version = '2.27.1.dev29'
+__version_tuple__ = version_tuple = (2, 27, 1, 'dev29')

locust/argument_parser.py

@@ -9,6 +9,7 @@ import atexit
 import os
 import platform
 import socket
+import ssl
 import sys
 import tempfile
 import textwrap
@@ -705,7 +706,7 @@ Typically ONLY these options (and --locustfile) need to be specified on workers,
         "-V",
         action="version",
         help="Show program's version number and exit",
-        version=f"locust {version} from {os.path.dirname(__file__)} (python {platform.python_version()})",
+        version=f"locust {version} from {os.path.dirname(__file__)} (Python {platform.python_version()}, {' '.join(ssl.OPENSSL_VERSION.split(' ')[0:2])})",
     )
     other_group.add_argument(
         "--exit-code-on-error",

locust/html.py

@@ -10,7 +10,7 @@ from jinja2 import Environment, FileSystemLoader
 
 from . import stats as stats_module
 from .runners import STATE_STOPPED, STATE_STOPPING, MasterRunner
-from .stats import sort_stats
+from .stats import sort_stats, update_stats_history
 from .user.inspectuser import get_ratio
 
 PERCENTILES_FOR_HTML_REPORT = [0.50, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 1.0]
@@ -54,6 +54,7 @@ def get_html_report(
         {**exc, "nodes": ", ".join(exc["nodes"])} for exc in environment.runner.exceptions.values()
     ]
 
+    update_stats_history(environment.runner)
     history = stats.history
 
     static_js = []

locust/main.py

@@ -434,7 +434,9 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         try:
             options.run_time = parse_timespan(options.run_time)
         except ValueError:
-            logger.error("Valid --run-time formats are: 20, 20s, 3m, 2h, 1h20m, 3h30m10s, etc.")
+            logger.error(
+                f"Invalid --run-time argument ({options.run_time}), accepted formats are for example 120, 120s, 2m, 3h, 3h30m10s."
+            )
             sys.exit(1)
 
     if options.csv_prefix:

locust/stats.py

@@ -907,28 +907,32 @@ def sort_stats(stats: dict[Any, S]) -> list[S]:
     return [stats[key] for key in sorted(stats.keys())]
 
 
+def update_stats_history(runner: Runner) -> None:
+    stats = runner.stats
+    current_response_time_percentiles = {
+        f"response_time_percentile_{percentile}": stats.total.get_current_response_time_percentile(percentile) or 0
+        for percentile in PERCENTILES_TO_CHART
+    }
+
+    r = {
+        **current_response_time_percentiles,
+        "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"),
+        "current_rps": stats.total.current_rps or 0,
+        "current_fail_per_sec": stats.total.current_fail_per_sec or 0,
+        "total_avg_response_time": stats.total.avg_response_time,
+        "user_count": runner.user_count or 0,
+    }
+    stats.history.append(r)
+
+
 def stats_history(runner: Runner) -> None:
     """Save current stats info to history for charts of report."""
     while True:
-        stats = runner.stats
-        if not stats.total.use_response_times_cache:
+        if not runner.stats.total.use_response_times_cache:
             break
         if runner.state != "stopped":
-            current_response_time_percentiles = {
-                f"response_time_percentile_{percentile}": stats.total.get_current_response_time_percentile(percentile)
-                or 0
-                for percentile in PERCENTILES_TO_CHART
-            }
-
-            r = {
-                **current_response_time_percentiles,
-                "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"),
-                "current_rps": stats.total.current_rps or 0,
-                "current_fail_per_sec": stats.total.current_fail_per_sec or 0,
-                "total_avg_response_time": stats.total.avg_response_time,
-                "user_count": runner.user_count or 0,
-            }
-            stats.history.append(r)
+            update_stats_history(runner)
+
         gevent.sleep(HISTORY_STATS_INTERVAL_SEC)
 
 

locust/web.py

@@ -146,8 +146,9 @@ class WebUI:
         @app.errorhandler(Exception)
         def handle_exception(error):
             error_message = str(error)
-            logger.log(logging.CRITICAL, error_message)
-            return make_response(error_message, getattr(error, "code", 500))
+            error_code = getattr(error, "code", 500)
+            logger.log(logging.INFO if error_code <= 404 else logging.ERROR, error_message)
+            return make_response(error_message, error_code)
 
         @app.route("/assets/<path:path>")
         def send_assets(path):

{locust-2.27.1.dev20.dist-info → locust-2.27.1.dev29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.27.1.dev20
+Version: 2.27.1.dev29
 Summary: Developer-friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://github.com/locustio/locust
@@ -32,7 +32,7 @@ Requires-Dist: Werkzeug >=2.0.0
 Requires-Dist: requests >=2.26.0
 Requires-Dist: msgpack >=1.0.0
 Requires-Dist: pyzmq >=25.0.0
-Requires-Dist: geventhttpclient ==2.2.1
+Requires-Dist: geventhttpclient >=2.3.1
 Requires-Dist: ConfigArgParse >=1.5.5
 Requires-Dist: psutil >=5.9.1
 Requires-Dist: Flask-Login >=0.6.3

{locust-2.27.1.dev20.dist-info → locust-2.27.1.dev29.dist-info}/RECORD

@@ -1,22 +1,22 @@
 locust/__init__.py,sha256=g6oA-Ba_hs3gLWVf5MKJ1mvfltI8MFnDWG8qslqm8yg,1402
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=_jDKPXlmNHRk4SY73n8LZJh3BjMwEJynHgWwKFEcWeE,428
-locust/argument_parser.py,sha256=5gUvJ6zLTscX1fUP25oAj_VemKl11Hm2aTm86cIlzWs,28680
+locust/_version.py,sha256=I6BTfLIphBjjt9ydexOJQNz7f8bA7p_9sx4GEtlDCaA,428
+locust/argument_parser.py,sha256=w4-Ue1XAFPwG3sLyXrpdV9ejKjTUOpcSsPBbCKwRbiQ,28740
 locust/clients.py,sha256=YKuAyMAbxs8_-w7XJw0hc67KFBNNLxibsw6FwiS01Q8,14781
 locust/debug.py,sha256=We6Z9W0btkKSc7PxWmrZx-xMynvOOsKhG6jmDgQin0g,5134
 locust/dispatch.py,sha256=vYh0QEDFgJ3hY0HgSk-EiNO7IP9ffzXF_Et8wB9JvsI,16995
 locust/env.py,sha256=SLtUQCYaiv_oq_Nz1xaB0OD8RkTdESt2b71vz_qohpo,12452
 locust/event.py,sha256=xgNKbcejxy1TNUfIdgV75KgD2_BOwQmvjrJ4hWuydRw,7740
 locust/exception.py,sha256=jGgJ32ubuf4pWdlaVOkbh2Y0LlG0_DHi-lv3ib8ppOE,1791
-locust/html.py,sha256=Qz3Php454f5QwIdJyP2ckJ2L9aNkdZQCVahFELfMBIc,3983
+locust/html.py,sha256=C-RvShjgRRqzzYGdOGCelobm_SlEGjp8TutvHou1er0,4050
 locust/input_events.py,sha256=ZIyePyAMuA_YFYWg18g_pE4kwuQV3RbEB250MzXRwjY,3314
 locust/log.py,sha256=cqLt7nnxnQuM4vWFB5EpJpNUTxGBVEkUJuaJPI1S7_Y,3186
-locust/main.py,sha256=snmuyKutaCYbjrhHDuPjbeqNAtWcC9wkPa0AnJswMGY,27780
+locust/main.py,sha256=NGjL5QqakU5aeyUzwu2Fh00xVZfC3eoBE3DtfOmRtcM,27854
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
 locust/runners.py,sha256=Go8b8fpOAfFy6JuNcot7KyguHuExA6eoPHVmcgx3RoI,67813
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
-locust/stats.py,sha256=dulIckrNr3t01LSOFvpr7LdBHj1YXHlEoK7q3b79z0A,45581
-locust/web.py,sha256=x12v0Raz8b3KaDr-WTLzsi9zxcbRutxUljKxNwQKtPU,26964
+locust/stats.py,sha256=-kI5fTGgs6w5FSaFYGhBAE2PnnCQWuBqmhYPTGPctTA,45558
+locust/web.py,sha256=DKYHrH2Aq3TJ-lKSjG15uEQH4MBlU_zqMZPclqoLtuU,27036
 locust/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/contrib/fasthttp.py,sha256=vByPepw35DF84qZ2xK89yHgjOA_8btV0wig_rSR6p4g,26757
 locust/rpc/__init__.py,sha256=nVGoHWFQxZjnhCDWjbgXIbmFbN9sizAjkhvSs9_642c,58
@@ -70,9 +70,9 @@ locust/webui/dist/report.html,sha256=sOdZZVgZbqgu86BBCSQf3uQUYXgmgSnXF32JpnyAII8
 locust/webui/dist/assets/favicon.ico,sha256=IUl-rYqfpHdV38e-s0bkmFIeLS-n3Ug0DQxk-h202hI,8348
 locust/webui/dist/assets/index-941b6e82.js,sha256=G3n5R81Svt0HzbWaV3AV20jLWGLr4X50UZ-Adu2KcxU,1645614
 locust/webui/dist/assets/logo.png,sha256=EIVPqr6wE_yqguHaqFHIsH0ZACLSrvNWyYO7PbyIj4w,19299
-locust-2.27.1.dev20.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.27.1.dev20.dist-info/METADATA,sha256=F965nQckJHN3QpXgiWhSEKeTX2jkrhhJIWTopHlp0_4,7264
-locust-2.27.1.dev20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-locust-2.27.1.dev20.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.27.1.dev20.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
-locust-2.27.1.dev20.dist-info/RECORD,,
+locust-2.27.1.dev29.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.27.1.dev29.dist-info/METADATA,sha256=IRkXkEESVfmwdyPrWMCNRf9dZhxMr8ai9BsxJ_vbIJ4,7264
+locust-2.27.1.dev29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+locust-2.27.1.dev29.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.27.1.dev29.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
+locust-2.27.1.dev29.dist-info/RECORD,,