locust 2.19.2.dev35__py3-none-any.whl → 2.19.2.dev41__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.19.2.dev35'
-__version_tuple__ = version_tuple = (2, 19, 2, 'dev35')
+__version__ = version = '2.19.2.dev41'
+__version_tuple__ = version_tuple = (2, 19, 2, 'dev41')

locust/rpc/protocol.py

@@ -1,4 +1,30 @@
 import msgpack
+import datetime
+from typing import Type
+
+try:
+    from bson import ObjectId  # type: ignore
+except ImportError:
+
+    class ObjectId:  # type: ignore
+        def __init__(self, s):
+            raise Exception("You need to install pymongo or at least bson to be able to send/receive ObjectIds")
+
+
+def decode(obj):
+    if "__datetime__" in obj:
+        obj = datetime.datetime.strptime(obj["as_str"], "%Y%m%dT%H:%M:%S.%f")
+    elif "__ObjectId__" in obj:
+        obj = ObjectId(obj["as_str"])
+    return obj
+
+
+def encode(obj):
+    if isinstance(obj, datetime.datetime):
+        return {"__datetime__": True, "as_str": obj.strftime("%Y%m%dT%H:%M:%S.%f")}
+    elif isinstance(obj, ObjectId):
+        return {"__ObjectId__": True, "as_str": str(obj)}
+    return obj
 
 
 class Message:
@@ -11,9 +37,9 @@ class Message:
         return f"<Message {self.type}:{self.node_id}>"
 
     def serialize(self):
-        return msgpack.dumps((self.type, self.data, self.node_id))
+        return msgpack.dumps((self.type, self.data, self.node_id), default=encode)
 
     @classmethod
     def unserialize(cls, data):
-        msg = cls(*msgpack.loads(data, raw=False, strict_map_key=False))
+        msg = cls(*msgpack.loads(data, raw=False, strict_map_key=False, object_hook=decode))
         return msg

locust/runners.py

@@ -37,6 +37,7 @@ import greenlet
 import psutil
 from gevent.event import Event
 from gevent.pool import Group
+import inspect
 
 from . import User
 from locust import __version__
@@ -380,7 +381,11 @@ class Runner:
         """
         if self.state == STATE_STOPPED:
             return
-        logger.debug("Stopping all users")
+        try:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            logger.debug(f"Stopping all users (called from {caller.filename}:{caller.lineno})")
+        except Exception:
+            logger.debug("Stopping all users (couldnt determine where stop() was called from)")
         self.environment.events.test_stopping.fire(environment=self.environment)
         self.final_user_classes_count = {**self.user_classes_count}
         self.update_state(STATE_CLEANUP)
@@ -1104,7 +1109,11 @@ class MasterRunner(DistributedRunner):
                 logger.debug(
                     f"Received {msg.type} message from worker {msg.node_id} (index {self.get_worker_index(msg.node_id)})"
                 )
-                self.custom_messages[msg.type](environment=self.environment, msg=msg)
+                try:
+                    self.custom_messages[msg.type](environment=self.environment, msg=msg)
+                except Exception:
+                    logging.error(f"Uncaught exception in handler for {msg.type}\n{traceback.format_exc()}")
+
             else:
                 logger.warning(
                     f"Unknown message type received from worker {msg.node_id} (index {self.get_worker_index(msg.node_id)}): {msg.type}"

{locust-2.19.2.dev35.dist-info → locust-2.19.2.dev41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.19.2.dev35
+Version: 2.19.2.dev41
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://locust.io/

{locust-2.19.2.dev35.dist-info → locust-2.19.2.dev41.dist-info}/RECORD

@@ -1,6 +1,6 @@
 locust/__init__.py,sha256=Q6sqz7YDUaMKPEqcDjWcXEFG2ilVRQR7kl0fG0yK_5A,1402
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=MBO6Q4w8eDPw8VrLjs9LCr9Q2Zb2ObRijqxVTTy8T9g,428
+locust/_version.py,sha256=pvgJAygxeD6uE6FLJUuG6Hrsg6ADbJuc_CmPLsBOT3M,428
 locust/argument_parser.py,sha256=H2tzJLu1F3oxxYkXLRUT6GtpV5UG5aGTcPWI3XwE4-c,26365
 locust/clients.py,sha256=GJXTWcyBAepE6O-o-V92WboV8XKOXxWR-AixlcL74_w,14768
 locust/debug.py,sha256=pEnZ74679vCdDODEMTNvjYcVdWCe4sWolHDJvdXh9dU,4818
@@ -13,14 +13,14 @@ locust/input_events.py,sha256=ARmzf5K_t4OnsNilkx0adDnNqvU9-NxtQvKOOjwgA_A,3048
 locust/log.py,sha256=2IVp9YL4ZPfWdj3sBFuOHfgneg3g7m7tUGR-sy2s3E8,3155
 locust/main.py,sha256=Kf9zoml_ZpRdTSgSA9-wtzJtcSzTZw-T0YIwV_Lgf50,27009
 locust/py.typed,sha256=gkWLl8yD4mIZnNYYAIRM8g9VarLvWmTAFeUfEbxJLBw,65
-locust/runners.py,sha256=ezvG4vjW7pmB66-VZ3yeoWfOuEpXf6VGCKVh36vjPeQ,65210
+locust/runners.py,sha256=MnlroX5PUMzrzGMyTWIN1YAT4lgRFY_dma-1hgDu3AQ,65647
 locust/shape.py,sha256=SrKDabGtZ5bqMopJDdivvLbPencaYfAPUv1qzQiAgiA,1969
 locust/stats.py,sha256=4_FRxgJltr16oWOOv2BIf7OvMJ0g2sa1s307F6BqdcM,45480
 locust/web.py,sha256=PWwRXTMt9X5KpzLvR0Ap8SokDfLc7unk5dktNgPtFCI,26045
 locust/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/contrib/fasthttp.py,sha256=BqHzpjqcYupQErm-1QJKh2gInpowuMhrvZluPQyo2EA,26479
 locust/rpc/__init__.py,sha256=nVGoHWFQxZjnhCDWjbgXIbmFbN9sizAjkhvSs9_642c,58
-locust/rpc/protocol.py,sha256=D-Wpb0YbDMwdrsojxhzbhoMv0UGzTHMZiI2c5hGskFA,489
+locust/rpc/protocol.py,sha256=AGFtveF7-_i5ipsRYhT-ily4blxnjZ3FXeIL6ZabO4c,1285
 locust/rpc/zmqrpc.py,sha256=zG6hli3RouftrI28XqAlHtZ-UUSM9Wn41HkY9cKgAU4,2591
 locust/static/chart.js,sha256=Aue4SxJZhv9I3k0Nr2uXTrdrLxsrX7x_a0d4u3a1e_Q,4796
 locust/static/echarts.common.min.js,sha256=2h6zIZeHk-eGAiC-qYvxv7uW5S1HcyM72K5FbcVhky4,620458
@@ -94,9 +94,9 @@ locust/webui/dist/report.html,sha256=Vyi9LIAjBNiAsvn6LVFkdAZ9R4Fa8UjHnqscjAeOFp8
 locust/webui/dist/assets/favicon.ico,sha256=IUl-rYqfpHdV38e-s0bkmFIeLS-n3Ug0DQxk-h202hI,8348
 locust/webui/dist/assets/index-d0af3b25.js,sha256=GUjx823w5GDMYQrm7g9dNhANSRaMP_9axaakCcSPQIs,1619387
 locust/webui/dist/assets/logo.png,sha256=lPCYhpDsPXYY3gUMlq3bzABI5WBtdBOvtay8R9hRFv4,2943
-locust-2.19.2.dev35.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
-locust-2.19.2.dev35.dist-info/METADATA,sha256=Nf-J2mMLWW86LImdrXxF9P5IC3UE1EDZ4E4VBuPPZ1Y,7150
-locust-2.19.2.dev35.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-locust-2.19.2.dev35.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
-locust-2.19.2.dev35.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
-locust-2.19.2.dev35.dist-info/RECORD,,
+locust-2.19.2.dev41.dist-info/LICENSE,sha256=78XGpIn3fHVBfaxlPNUfjVufSN7QsdhpJMRJHv2AFpo,1095
+locust-2.19.2.dev41.dist-info/METADATA,sha256=t6fsiw0k0BDhcntVjkk9TwUcVFOw2mu-ZvV8AICJ4yY,7150
+locust-2.19.2.dev41.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+locust-2.19.2.dev41.dist-info/entry_points.txt,sha256=RAdt8Ku-56m7bFjmdj-MBhbF6h4NX7tVODR9QNnOg0E,44
+locust-2.19.2.dev41.dist-info/top_level.txt,sha256=XSsjgPA8Ggf9TqKVbkwSqZFuPlZ085X13M9orDycE20,7
+locust-2.19.2.dev41.dist-info/RECORD,,