locust 2.31.9.dev35__tar.gz → 2.31.9.dev42__tar.gz

{locust-2.31.9.dev35 → locust-2.31.9.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.31.9.dev35
+Version: 2.31.9.dev42
 Summary: Developer-friendly load testing framework
 Home-page: https://locust.io/
 License: MIT

{locust-2.31.9.dev35 → locust-2.31.9.dev42}/locust/_version.py

@@ -14,7 +14,7 @@ __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
 
-__version__ = "2.31.9.dev35"
+__version__ = "2.31.9.dev42"
 version = __version__
-__version_tuple__ = (2, 31, 9, "dev35")
+__version_tuple__ = (2, 31, 9, "dev42")
 version_tuple = __version_tuple__

{locust-2.31.9.dev35 → locust-2.31.9.dev42}/locust/main.py

@@ -239,6 +239,7 @@ def main():
                 options.run_time = None
                 options.autostart = None
                 options.csv_prefix = None
+                options.html_file = None
                 break
         else:
             # we're in the parent process

{locust-2.31.9.dev35 → locust-2.31.9.dev42}/locust/rpc/zmqrpc.py

@@ -1,22 +1,24 @@
 from locust.exception import RPCError, RPCReceiveError, RPCSendError
 from locust.util.exception_handler import retry
 
+import socket as csocket
+from socket import gaierror, has_dualstack_ipv6
+
 import msgpack.exceptions as msgerr
 import zmq.error as zmqerr
 import zmq.green as zmq
-from urllib3.util.connection import HAS_IPV6
 
 from .protocol import Message
 
 
 class BaseSocket:
-    def __init__(self, sock_type):
+    def __init__(self, sock_type, ipv4_only):
         context = zmq.Context()
         self.socket = context.socket(sock_type)
 
         self.socket.setsockopt(zmq.TCP_KEEPALIVE, 1)
         self.socket.setsockopt(zmq.TCP_KEEPALIVE_IDLE, 30)
-        if HAS_IPV6:
+        if has_dualstack_ipv6() and not ipv4_only:
             self.socket.setsockopt(zmq.IPV6, 1)
 
     @retry()
@@ -60,10 +62,19 @@ class BaseSocket:
     def close(self, linger=None):
         self.socket.close(linger=linger)
 
+    def ipv4_only(self, host, port) -> bool:
+        try:
+            if str(csocket.getaddrinfo(host, port, proto=csocket.IPPROTO_TCP)).find("Family.AF_INET6") == -1:
+                return True
+        except gaierror as e:
+            print(f"Error resolving address: {e}")
+            return False
+        return False
+
 
 class Server(BaseSocket):
     def __init__(self, host, port):
-        BaseSocket.__init__(self, zmq.ROUTER)
+        BaseSocket.__init__(self, zmq.ROUTER, self.ipv4_only(host, port))
         if port == 0:
             self.port = self.socket.bind_to_random_port(f"tcp://{host}")
         else:
@@ -76,6 +87,6 @@ class Server(BaseSocket):
 
 class Client(BaseSocket):
     def __init__(self, host, port, identity):
-        BaseSocket.__init__(self, zmq.DEALER)
+        BaseSocket.__init__(self, zmq.DEALER, self.ipv4_only(host, port))
         self.socket.setsockopt(zmq.IDENTITY, identity.encode())
         self.socket.connect("tcp://%s:%i" % (host, port))

{locust-2.31.9.dev35 → locust-2.31.9.dev42}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry_dynamic_versioning.backend"
 [tool.poetry]
 name = "locust"
 description = "Developer-friendly load testing framework"
-version = "2.31.9.dev35"
+version = "2.31.9.dev42"
 license = "MIT"
 readme = "README.md"
 authors = ["Jonatan Heyman", "Lars Holmberg"]