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
563e3b44
Commit
563e3b44
authored
Nov 19, 2014
by
Patrick Gerken
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7 from do3cc/master
Add server side logging for MTDelay
parents
5e1e4052
71b219a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGES.rst
CHANGES.rst
+6
-0
src/ZEO/zrpc/connection.py
src/ZEO/zrpc/connection.py
+2
-1
No files found.
CHANGES.rst
View file @
563e3b44
Changelog
Changelog
=========
=========
4.0.1dev (unreleased)
---------------------
- Log errors on server side even if using multi threaded delay.
4.0.0 (2013-08-18)
4.0.0 (2013-08-18)
------------------
------------------
...
...
src/ZEO/zrpc/connection.py
View file @
563e3b44
...
@@ -52,7 +52,7 @@ class Delay:
...
@@ -52,7 +52,7 @@ class Delay:
def
error
(
self
,
exc_info
):
def
error
(
self
,
exc_info
):
self
.
sent
=
'error'
self
.
sent
=
'error'
log
(
"Error raised in delayed method"
,
logging
.
ERROR
,
exc_info
=
True
)
log
(
"Error raised in delayed method"
,
logging
.
ERROR
,
exc_info
=
exc_info
)
self
.
conn
.
return_error
(
self
.
msgid
,
*
exc_info
[:
2
])
self
.
conn
.
return_error
(
self
.
msgid
,
*
exc_info
[:
2
])
def
__repr__
(
self
):
def
__repr__
(
self
):
...
@@ -84,6 +84,7 @@ class MTDelay(Delay):
...
@@ -84,6 +84,7 @@ class MTDelay(Delay):
def
error
(
self
,
exc_info
):
def
error
(
self
,
exc_info
):
self
.
ready
.
wait
()
self
.
ready
.
wait
()
log
(
"Error raised in delayed method"
,
logging
.
ERROR
,
exc_info
=
exc_info
)
self
.
conn
.
call_from_thread
(
Delay
.
error
,
self
,
exc_info
)
self
.
conn
.
call_from_thread
(
Delay
.
error
,
self
,
exc_info
)
# PROTOCOL NEGOTIATION
# PROTOCOL NEGOTIATION
...
...
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