diff --git a/CHANGES.md b/CHANGES.md index b8108a21..4a597fac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ ### 0.x.x (2015-xx-xx xx:xx:xx UTC) * Update Tornado webserver to 4.2.dev1 (609dbb9) +* Update change to suppress reporting of Tornado exception error 1 to updated package as listed in hacks.txt * Change network names to only display on top line of Day by Day layout on Episode View * Reposition country part of network name into the hover over in Day by Day layout * Add ToTV provider 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 3a175a67..f255dc1f 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -644,8 +644,9 @@ class BaseIOStream(object): pos = self._read_to_buffer_loop() except UnsatisfiableReadError: raise - except Exception: - gen_log.warning("error on read", exc_info=True) + except Exception as e: + if 1 != e.errno: + gen_log.warning("error on read", exc_info=True) self.close(exc_info=True) return if pos is not None: