locust 2.28.1.dev13__py3-none-any.whl → 2.28.1.dev19__py3-none-any.whl

locust/_version.py

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

locust/html.py

@@ -12,6 +12,7 @@ from . import stats as stats_module
 from .runners import STATE_STOPPED, STATE_STOPPING, MasterRunner
 from .stats import sort_stats, update_stats_history
 from .user.inspectuser import get_ratio
+from .util.date import format_utc_timestamp
 
 PERCENTILES_FOR_HTML_REPORT = [0.50, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 1.0]
 ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
@@ -32,11 +33,10 @@ def get_html_report(
 ):
     stats = environment.runner.stats
 
-    start_ts = stats.start_time
-    start_time = datetime.datetime.fromtimestamp(start_ts, tz=datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
+    start_time = format_utc_timestamp(stats.start_time)
 
     if end_ts := stats.last_request_timestamp:
-        end_time = datetime.datetime.fromtimestamp(end_ts, tz=datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
+        end_time = format_utc_timestamp(end_ts)
     else:
         end_time = start_time
 

locust/util/date.py

@@ -0,0 +1,5 @@
+from datetime import datetime
+
+
+def format_utc_timestamp(unix_timestamp):
+    return datetime.utcfromtimestamp(unix_timestamp).strftime("%Y-%m-%dT%H:%M:%SZ")

locust/web.py

@@ -530,7 +530,17 @@ class WebUI:
                 (self.host, self.port), self.app, log=None, keyfile=self.tls_key, certfile=self.tls_cert
             )
         else:
-            self.server = pywsgi.WSGIServer((self.host, self.port), self.app, log=None)
+
+            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})"
+                    return True
+
+            logger.addFilter(RewriteFilter())
+            self.server = pywsgi.WSGIServer((self.host, self.port), self.app, log=None, error_log=logger)
+
         self.server.serve_forever()
 
     def stop(self):