diff --git a/CHANGES.md b/CHANGES.md index f1d6c2e0..150f06c7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ * Update Requests library to 2.7.0 (5d6d1bc) * Update SimpleJSON library 3.7.3 to 3.8.0 (a37a9bd) * Update Tornado Web Server 4.2 to 4.3.dev1 (1b6157d) +* Update change to suppress reporting of Tornado exception error 1 to updated package (ref:hacks.txt) ### 0.10.0 (2015-08-06 11:05:00 UTC) diff --git a/tornado/http1connection.py b/tornado/http1connection.py index 6226ef7a..5d6f4c21 100644 --- a/tornado/http1connection.py +++ b/tornado/http1connection.py @@ -698,8 +698,9 @@ class HTTP1ServerConnection(object): # This exception was already logged. conn.close() return - except Exception: - gen_log.error("Uncaught exception", exc_info=True) + except Exception as e: + if 1 != e.errno: + gen_log.error("Uncaught exception", exc_info=True) conn.close() return if not ret: diff --git a/tornado/iostream.py b/tornado/iostream.py index c5d3e2c9..706d3938 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -648,7 +648,8 @@ class BaseIOStream(object): except UnsatisfiableReadError: raise except Exception as e: - gen_log.warning("error on read: %s" % e) + if 1 != e.errno: + gen_log.warning("error on read: %s" % e) self.close(exc_info=True) return if pos is not None: