Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
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
Zope
Commits
e03a5f03
Commit
e03a5f03
authored
Sep 01, 2010
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent uncaught exceptions from killing ZServer worker threads.
https://bugs.launchpad.net/zope2/+bug/627988
.
parent
b5890a9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
19 deletions
+30
-19
doc/CHANGES.txt
doc/CHANGES.txt
+3
-0
lib/python/ZServer/PubCore/ZServerPublisher.py
lib/python/ZServer/PubCore/ZServerPublisher.py
+27
-19
No files found.
doc/CHANGES.txt
View file @
e03a5f03
...
...
@@ -8,6 +8,9 @@ Zope Changes
Bugs Fixed
- Prevent uncaught exceptions from killing ZServer worker threads.
https://bugs.launchpad.net/zope2/+bug/627988
- Ensure that mailhosts which share a queue directory do not double-
deliver mails, by sharing the thread which processes emails for
that directory. https://bugs.launchpad.net/zope2/+bug/574286
...
...
lib/python/ZServer/PubCore/ZServerPublisher.py
View file @
e03a5f03
...
...
@@ -11,28 +11,36 @@
#
##############################################################################
import
logging
LOG
=
logging
.
getLogger
(
'ZServerPublisher'
)
class
ZServerPublisher
:
def
__init__
(
self
,
accept
):
from
sys
import
exc_info
from
ZPublisher
import
publish_module
from
ZPublisher.WSGIPublisher
import
publish_module
as
publish_wsgi
while
1
:
name
,
a
,
b
=
accept
()
if
name
==
"Zope2"
:
try
:
publish_module
(
name
,
request
=
a
,
response
=
b
)
finally
:
b
.
_finish
()
a
=
b
=
None
try
:
name
,
a
,
b
=
accept
()
if
name
==
"Zope2"
:
try
:
publish_module
(
name
,
request
=
a
,
response
=
b
)
finally
:
b
.
_finish
()
a
=
b
=
None
elif
name
==
"Zope2WSGI"
:
try
:
res
=
publish_wsgi
(
a
,
b
)
for
r
in
res
:
a
[
'wsgi.output'
].
write
(
r
)
finally
:
# TODO: Support keeping connections open.
a
[
'wsgi.output'
].
_close
=
1
a
[
'wsgi.output'
].
close
()
elif
name
==
"Zope2WSGI"
:
try
:
res
=
publish_wsgi
(
a
,
b
)
for
r
in
res
:
a
[
'wsgi.output'
].
write
(
r
)
finally
:
# TODO: Support keeping connections open.
a
[
'wsgi.output'
].
_close
=
1
a
[
'wsgi.output'
].
close
()
except
:
LOG
.
error
(
'exception caught'
,
exc_info
=
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