Commit dad1a01f authored by Jim Fulton's avatar Jim Fulton

Only look at ZEO_MSGPACK if msgpack ZConfig option wasn't used.

parent 7947a0c1
...@@ -343,7 +343,8 @@ def create_server(storages, options): ...@@ -343,7 +343,8 @@ def create_server(storages, options):
storages, storages,
read_only = options.read_only, read_only = options.read_only,
client_conflict_resolution=options.client_conflict_resolution, client_conflict_resolution=options.client_conflict_resolution,
msgpack=options.msgpack or os.environ.get('ZEO_MSGPACK'), msgpack=(options.msgpack if isinstance(options.msgpack, bool)
else os.environ.get('ZEO_MSGPACK')),
invalidation_queue_size = options.invalidation_queue_size, invalidation_queue_size = options.invalidation_queue_size,
invalidation_age = options.invalidation_age, invalidation_age = options.invalidation_age,
transaction_timeout = options.transaction_timeout, transaction_timeout = options.transaction_timeout,
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</description> </description>
</key> </key>
<key name="msgpack" datatype="boolean" required="no" default="false"> <key name="msgpack" datatype="boolean" required="no">
<description> <description>
Use msgpack to serialize and de-serialize ZEO protocol messages. Use msgpack to serialize and de-serialize ZEO protocol messages.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment