Browse Source

Update change to suppress reporting of Tornado exception error 1 to updated package as listed in hacks.txt.

pull/334/head
JackDandy 10 years ago
committed by JackDandy
parent
commit
2f266a4b5f
  1. 1
      CHANGES.md
  2. 5
      tornado/http1connection.py
  3. 5
      tornado/iostream.py

1
CHANGES.md

@ -1,6 +1,7 @@
### 0.x.x (2015-xx-xx xx:xx:xx UTC) ### 0.x.x (2015-xx-xx xx:xx:xx UTC)
* Update Tornado webserver to 4.2.dev1 (609dbb9) * 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 * 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 * Reposition country part of network name into the hover over in Day by Day layout
* Add ToTV provider * Add ToTV provider

5
tornado/http1connection.py

@ -698,8 +698,9 @@ class HTTP1ServerConnection(object):
# This exception was already logged. # This exception was already logged.
conn.close() conn.close()
return return
except Exception: except Exception as e:
gen_log.error("Uncaught exception", exc_info=True) if 1 != e.errno:
gen_log.error("Uncaught exception", exc_info=True)
conn.close() conn.close()
return return
if not ret: if not ret:

5
tornado/iostream.py

@ -644,8 +644,9 @@ class BaseIOStream(object):
pos = self._read_to_buffer_loop() pos = self._read_to_buffer_loop()
except UnsatisfiableReadError: except UnsatisfiableReadError:
raise raise
except Exception: except Exception as e:
gen_log.warning("error on read", exc_info=True) if 1 != e.errno:
gen_log.warning("error on read", exc_info=True)
self.close(exc_info=True) self.close(exc_info=True)
return return
if pos is not None: if pos is not None:

Loading…
Cancel
Save