Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZEO
Commits
dad1a01f
Commit
dad1a01f
authored
Jan 12, 2017
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only look at ZEO_MSGPACK if msgpack ZConfig option wasn't used.
parent
7947a0c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
src/ZEO/runzeo.py
src/ZEO/runzeo.py
+2
-1
src/ZEO/server.xml
src/ZEO/server.xml
+1
-1
No files found.
src/ZEO/runzeo.py
View file @
dad1a01f
...
@@ -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
,
...
...
src/ZEO/server.xml
View file @
dad1a01f
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment