make sure we return the correct error with the last traceback.

fix #630
benoitc · Mar 9, 2014 · 0e4d9f0 · 0e4d9f0 · pdodde · Mar 11, 2014
1 parent 41e7aba
commit 0e4d9f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gunicorn/workers/async.py b/gunicorn/workers/async.py
@@ -7,6 +7,7 @@
 import errno
 import socket
 import ssl
+import sys
 
 import gunicorn.http as http
 import gunicorn.http.wsgi as wsgi
@@ -48,9 +49,13 @@ def handle(self, listener, client, addr):
             except StopIteration as e:
                 self.log.debug("Closing connection. %s", e)
             except ssl.SSLError:
-                raise  # pass to next try-except level
+                exc_info = sys.exc_info()
+                # pass to next try-except level
+                six.reraise(exc_info[0], exc_info[1], exc_info[2])
             except socket.error:
-                raise  # pass to next try-except level
+                exc_info = sys.exc_info()
+                # pass to next try-except level
+                six.reraise(exc_info[0], exc_info[1], exc_info[2])
             except Exception as e:
                 self.handle_error(req, client, addr, e)
         except ssl.SSLError as e:

diff --git a/gunicorn/workers/sync.py b/gunicorn/workers/sync.py
@@ -10,6 +10,7 @@
 import select
 import socket
 import ssl
+import sys
 
 import gunicorn.http as http
 import gunicorn.http.wsgi as wsgi
@@ -144,7 +145,9 @@ def handle_request(self, listener, req, client, addr):
                 if hasattr(respiter, "close"):
                     respiter.close()
         except socket.error:
-            raise
+            exc_info = sys.exc_info()
+            # pass to next try-except level
+            six.reraise(exc_info[0], exc_info[1], exc_info[2])
         except Exception:
             if resp and resp.headers_sent:
                 # If the requests have already been sent, we should close the