Skip to content

Commit

Permalink
Set strict_map_key=False when unserializing master/slave messages, si…
Browse files Browse the repository at this point in the history
…nce it’s default has been set to True in msgpack 1.0. Fixes a crash bug when running Locust distributed with latest msgpack.
  • Loading branch information
heyman committed Feb 25, 2020
1 parent 7fac00a commit 5d25580
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion locust/rpc/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ def serialize(self):

@classmethod
def unserialize(cls, data):
msg = cls(*msgpack.loads(data, raw=False))
msg = cls(*msgpack.loads(data, raw=False, strict_map_key=False))
return msg
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"gevent==1.5a3",
"flask>=0.10.1",
"requests>=2.9.1",
"msgpack-python>=0.4.2",
"msgpack-python>=0.6.2",
"pyzmq>=16.0.2",
"geventhttpclient-wheels==1.3.1.dev2",
"ConfigArgParse>=1.0",
Expand Down

0 comments on commit 5d25580

Please sign in to comment.