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
68b48d4b
Commit
68b48d4b
authored
May 22, 2015
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix StorageServer.server_status under Py3K
parent
0afe4447
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
src/ZEO/StorageServer.py
src/ZEO/StorageServer.py
+7
-2
No files found.
src/ZEO/StorageServer.py
View file @
68b48d4b
...
@@ -20,6 +20,7 @@ TODO: Need some basic access control-- a declaration of the methods
...
@@ -20,6 +20,7 @@ TODO: Need some basic access control-- a declaration of the methods
exported for invocation by the server.
exported for invocation by the server.
"""
"""
import
asyncore
import
asyncore
import
codecs
import
itertools
import
itertools
import
logging
import
logging
import
os
import
os
...
@@ -1309,8 +1310,12 @@ class StorageServer:
...
@@ -1309,8 +1310,12 @@ class StorageServer:
status
[
'connections'
]
=
len
(
status
[
'connections'
])
status
[
'connections'
]
=
len
(
status
[
'connections'
])
status
[
'waiting'
]
=
len
(
self
.
_waiting
[
storage_id
])
status
[
'waiting'
]
=
len
(
self
.
_waiting
[
storage_id
])
status
[
'timeout-thread-is-alive'
]
=
self
.
timeouts
[
storage_id
].
isAlive
()
status
[
'timeout-thread-is-alive'
]
=
self
.
timeouts
[
storage_id
].
isAlive
()
status
[
'last-transaction'
]
=
(
last_transaction
=
self
.
storages
[
storage_id
].
lastTransaction
()
self
.
storages
[
storage_id
].
lastTransaction
().
encode
(
'hex'
))
last_transaction_hex
=
codecs
.
encode
(
last_transaction
,
'hex_codec'
)
if
PY3
:
# doctests and maybe clients expect a str, not bytes
last_transaction_hex
=
str
(
last_transaction_hex
,
'ascii'
)
status
[
'last-transaction'
]
=
last_transaction_hex
return
status
return
status
def
ruok
(
self
):
def
ruok
(
self
):
...
...
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