Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZODB
Commits
7946bcb3
Commit
7946bcb3
authored
Feb 15, 2007
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added logic to avoid spurious errors from the logging system on exit.
parent
05cf02d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
NEWS.txt
NEWS.txt
+5
-1
src/ZEO/zrpc/connection.py
src/ZEO/zrpc/connection.py
+19
-9
No files found.
NEWS.txt
View file @
7946bcb3
What's new on ZODB 3.7.0b3?
What's new on ZODB 3.7.0b4?
===========================
===========================
Packaging
Packaging
...
@@ -19,6 +20,9 @@ Packaging
...
@@ -19,6 +20,9 @@ Packaging
ClientStorage
ClientStorage
-------------
-------------
- (3.7b4) Added logic to avoid spurious errors from the logging system
on exit.
- (3.7b2) Removed the "sync" mode for ClientStorage.
- (3.7b2) Removed the "sync" mode for ClientStorage.
Previously, a ClientStorage could be in either "sync" mode or "async"
Previously, a ClientStorage could be in either "sync" mode or "async"
...
...
src/ZEO/zrpc/connection.py
View file @
7946bcb3
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
#
#
##############################################################################
##############################################################################
import
asyncore
import
asyncore
import
atexit
import
errno
import
errno
import
select
import
select
import
sys
import
sys
...
@@ -39,6 +40,7 @@ client_timeout_count = 0 # for testing
...
@@ -39,6 +40,7 @@ client_timeout_count = 0 # for testing
client_map
=
{}
client_map
=
{}
client_trigger
=
trigger
(
client_map
)
client_trigger
=
trigger
(
client_map
)
client_logger
=
logging
.
getLogger
(
'ZEO.zrpc.client_loop'
)
client_logger
=
logging
.
getLogger
(
'ZEO.zrpc.client_loop'
)
atexit
.
register
(
client_map
.
clear
)
def
client_loop
():
def
client_loop
():
map
=
client_map
map
=
client_map
...
@@ -106,8 +108,13 @@ def client_loop():
...
@@ -106,8 +108,13 @@ def client_loop():
_exception
(
obj
)
_exception
(
obj
)
except
:
except
:
if
map
:
try
:
client_logger
.
critical
(
'The ZEO cient loop failed.'
,
client_logger
.
critical
(
'The ZEO cient loop failed.'
,
exc_info
=
sys
.
exc_info
())
exc_info
=
sys
.
exc_info
())
except
:
pass
for
fd
,
obj
in
map
.
items
():
for
fd
,
obj
in
map
.
items
():
if
obj
is
client_trigger
:
if
obj
is
client_trigger
:
continue
continue
...
@@ -115,8 +122,11 @@ def client_loop():
...
@@ -115,8 +122,11 @@ def client_loop():
obj
.
mgr
.
client
.
close
()
obj
.
mgr
.
client
.
close
()
except
:
except
:
map
.
pop
(
fd
,
None
)
map
.
pop
(
fd
,
None
)
try
:
client_logger
.
critical
(
"Couldn't close a dispatcher."
,
client_logger
.
critical
(
"Couldn't close a dispatcher."
,
exc_info
=
sys
.
exc_info
())
exc_info
=
sys
.
exc_info
())
except
:
pass
client_thread
=
threading
.
Thread
(
target
=
client_loop
)
client_thread
=
threading
.
Thread
(
target
=
client_loop
)
client_thread
.
setDaemon
(
True
)
client_thread
.
setDaemon
(
True
)
...
...
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