locust 2.31.9.dev36__py3-none-any.whl → 2.31.9.dev42__py3-none-any.whl

locust/_version.py

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

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.dev36.dist-info → locust-2.31.9.dev42.dist-info}/METADATA

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

{locust-2.31.9.dev36.dist-info → locust-2.31.9.dev42.dist-info}/RECORD

@@ -1,6 +1,6 @@
 locust/__init__.py,sha256=Jit8eNUrwuMLqavyFvMZr69e61DILq_KB4yT4MciScw,1681
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=IT1d4pbYfb-oI4tTIij7VA8fkXJrh6ezTqgh4QC_CHk,460
+locust/_version.py,sha256=r9WhAr_Pm9hFnpvzxO9xN4ygo_eaOXzt_sqtB9N4ExQ,460
 locust/argument_parser.py,sha256=Q_P7Yt0KdtOiNAgTZcEVuxX9eGzJoyibI3mPrf0vzvA,29184
 locust/clients.py,sha256=XK-xabq2_5GZKMEjebDobvEjeBTtCs8h2EelL7s68Qs,19346
 locust/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ locust/main.py,sha256=tNitGfy0oEOd9h9jzbHRSNagxK-MXQ60Ov9hjb4RosA,29378
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
 locust/rpc/__init__.py,sha256=nVGoHWFQxZjnhCDWjbgXIbmFbN9sizAjkhvSs9_642c,58
 locust/rpc/protocol.py,sha256=n-rb3GZQcAlldYDj4E4GuFGylYj_26GSS5U29meft5Y,1282
-locust/rpc/zmqrpc.py,sha256=AAY6w7wSFHsW34qqN28666boHFf6dTSAXPQJnAO6iUI,2707
+locust/rpc/zmqrpc.py,sha256=_zl0DKazQLD2YyqxvyuskVApsDCaUnhloHvV8SkJxjw,3157
 locust/runners.py,sha256=YwUFagjLcNEXj4_64g047xWncL5m4Hd99Lg6PzYkGOQ,70366
 locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
 locust/stats.py,sha256=z_s98ClnSfryvRi-VS0c7u5g87B_o4qL8nkunkPuhPI,45989
@@ -47,8 +47,8 @@ locust/webui/dist/auth.html,sha256=-iVQdm91uJlX054bB1HWgxz3TOSUZ3T8NVbwhvFDUoM,6
 locust/webui/dist/index.html,sha256=dMce1Nqjto_v1VJTv0V5Il257TDQ0hKRqsQPQhwqhio,654
 locust/webui/dist/report.html,sha256=0MceANwhR3KBquonRTkDVLfg_pHrMA7s2CHSz_X0QHc,1471010
 poetry.lock,sha256=M915pfu8Aer_KLr-xSjfsqxyrmfOulhzSLfsxYkM-ok,208302
-locust-2.31.9.dev36.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.31.9.dev36.dist-info/METADATA,sha256=MK5x9x5baluEL33pXT-nGuWW4VG246XLRFGb7sHNCUA,7725
-locust-2.31.9.dev36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-locust-2.31.9.dev36.dist-info/entry_points.txt,sha256=RhIxlLwU_Ae_WjimS5COUDLagdCh6IOMyLtgaQxNmlM,43
-locust-2.31.9.dev36.dist-info/RECORD,,
+locust-2.31.9.dev42.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.31.9.dev42.dist-info/METADATA,sha256=EY3drVvjt_sxL6fpr6gor601LA__NqiU8zsGZtPHizA,7725
+locust-2.31.9.dev42.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+locust-2.31.9.dev42.dist-info/entry_points.txt,sha256=RhIxlLwU_Ae_WjimS5COUDLagdCh6IOMyLtgaQxNmlM,43
+locust-2.31.9.dev42.dist-info/RECORD,,