locust 2.27.1.dev7__tar.gz → 2.27.1.dev12__tar.gz

{locust-2.27.1.dev7/locust.egg-info → locust-2.27.1.dev12}/PKG-INFO

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

{locust-2.27.1.dev7 → locust-2.27.1.dev12}/locust/_version.py

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

{locust-2.27.1.dev7 → locust-2.27.1.dev12}/locust/argument_parser.py

@@ -32,6 +32,16 @@ version = locust.__version__
 DEFAULT_CONFIG_FILES = ("~/.locust.conf", "locust.conf", "pyproject.toml")
 
 
+# Clean up downloaded locustfile on exit
+def exit_handler(filename) -> None:
+    try:
+        os.remove(filename)
+    except FileNotFoundError:
+        pass  # when multiple workers are running on the same machine, another one may already have deleted it
+    except PermissionError:
+        pass  # this happens occasionally on windows on GH, maybe for the same reason?
+
+
 class LocustArgumentParser(configargparse.ArgumentParser):
     """Drop-in replacement for `configargparse.ArgumentParser` that adds support for
     optionally exclude arguments from the UI.
@@ -170,14 +180,7 @@ def download_locustfile_from_url(url: str) -> str:
     with open(os.path.join(tempfile.gettempdir(), url.rsplit("/", 1)[-1]), "w") as locustfile:
         locustfile.write(response.text)
 
-    # Clean up downloaded files on exit
-    def exit_handler():
-        try:
-            os.remove(locustfile.name)
-        except FileNotFoundError:
-            pass  # this is normal when multiple workers are running on the same machine
-
-    atexit.register(exit_handler)
+    atexit.register(exit_handler, locustfile.name)
     return locustfile.name
 
 
@@ -263,13 +266,7 @@ def download_locustfile_from_master(master_host: str, master_port: int) -> str:
     with open(os.path.join(tempfile.gettempdir(), filename), "w", encoding="utf-8") as locustfile:
         locustfile.write(msg.data["contents"])
 
-    def exit_handler():
-        try:
-            os.remove(locustfile.name)
-        except FileNotFoundError:
-            pass  # this is normal when multiple workers are running on the same machine
-
-    atexit.register(exit_handler)
+    atexit.register(exit_handler, locustfile.name)
 
     tempclient.close()
     return locustfile.name

{locust-2.27.1.dev7 → locust-2.27.1.dev12}/locust/log.py

@@ -1,8 +1,9 @@
 import logging
 import logging.config
+import re
 import socket
 
-HOSTNAME = socket.gethostname()
+HOSTNAME = re.sub(r"\..*", "", socket.gethostname())
 
 # Global flag that we set to True if any unhandled exception occurs in a greenlet
 # Used by main.py to set the process return code to non-zero

{locust-2.27.1.dev7 → locust-2.27.1.dev12}/locust/main.py

@@ -175,11 +175,11 @@ def main():
         sys.exit(1)
 
     if options.hatch_rate:
-        sys.stderr.write("[DEPRECATED] The --hatch-rate parameter has been renamed --spawn-rate\n")
-        options.spawn_rate = options.hatch_rate
+        sys.stderr.write("--hatch-rate parameter has been renamed --spawn-rate\n")
+        sys.exit(1)
 
     if options.legacy_ui:
-        sys.stderr.write("[REMOVED] The legacy UI has been removed. Remove this flag to use the new UI")
+        sys.stderr.write("--legacy-ui is no longer supported, remove the parameter to continue\n")
         sys.exit(1)
 
     # setup logging

{locust-2.27.1.dev7 → locust-2.27.1.dev12/locust.egg-info}/PKG-INFO

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