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

zopefoundation · Jan 12, 2017 · dad1a01 · dad1a01
1 parent 7947a0c
commit dad1a01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/ZEO/runzeo.py b/src/ZEO/runzeo.py
@@ -343,7 +343,8 @@ def create_server(storages, options):
         storages,
         read_only = options.read_only,
         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_age = options.invalidation_age,
         transaction_timeout = options.transaction_timeout,

diff --git a/src/ZEO/server.xml b/src/ZEO/server.xml
@@ -115,7 +115,7 @@
       </description>
     </key>
 
-    <key name="msgpack" datatype="boolean" required="no" default="false">
+    <key name="msgpack" datatype="boolean" required="no">
       <description>
         Use msgpack to serialize and de-serialize ZEO protocol messages.