This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5764

server: skip logging of ECONNRESET
ClosedPublic

Authored by durin42 on Jan 30 2019, 6:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6bbb12cba5a8: server: skip logging of ECONNRESET
rHG39bac0bdcddf: server: skip logging of ECONNRESET
Summary

I believe this was exposed by 5492dc20, because the sending of the 500
would have already failed and prevented this logging. On Python 3,
this will be a ConnectionResetError, which is a subtype of OSError,
which is why we check for both OSError and socket.error.

Bonus: this fixes a race in test-hgweb.t where sometimes the
ECONNRESET wouldn't happen, because now we just don't log those
errors.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jan 30 2019, 6:09 PM
Closed by commit rHG39bac0bdcddf: server: skip logging of ECONNRESET (authored by durin42). · Explain WhyJan 30 2019, 7:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/server.py (18 lines)
Mtests/test-hgweb.t (12 lines)

Diff 13612

mercurial/hgweb/server.py

self.do_hgweb() self.do_hgweb()
except socket.error as inst: except socket.error as inst:
if inst.errno != errno.EPIPE: if inst.errno != errno.EPIPE:
raise raise
def do_POST(self): def do_POST(self):
try: try:
self.do_write() self.do_write()
except Exception: except Exception as e:
# I/O below could raise another exception. So log the original # I/O below could raise another exception. So log the original
# exception first to ensure it is recorded. # exception first to ensure it is recorded.
if not (isinstance(e, (OSError, socket.error))
and e.errno == errno.ECONNRESET):
tb = r"".join(traceback.format_exception(*sys.exc_info())) tb = r"".join(traceback.format_exception(*sys.exc_info()))
# We need a native-string newline to poke in the log # We need a native-string newline to poke in the log
# message, because we won't get a newline when using an # message, because we won't get a newline when using an
# r-string. This is the easy way out. # r-string. This is the easy way out.
newline = chr(10) newline = chr(10)
self.log_error(r"Exception happened during processing " self.log_error(r"Exception happened during processing "
r"request '%s':%s%s", self.path, newline, tb) r"request '%s':%s%s", self.path, newline, tb)
self._start_response(r"500 Internal Server Error", []) self._start_response(r"500 Internal Server Error", [])
self._write(b"Internal Server Error") self._write(b"Internal Server Error")
self._done() self._done()
def do_PUT(self): def do_PUT(self):
self.do_POST() self.do_POST()

tests/test-hgweb.t

[1] [1]
$ rm -R repo $ rm -R repo
$ killdaemons.py $ killdaemons.py
errors errors
$ cat errors.log | "$PYTHON" $TESTDIR/filtertraceback.py $ cat errors.log | "$PYTHON" $TESTDIR/filtertraceback.py
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/?cmd=spam': (glob)
Traceback (most recent call last):
error: [Errno 104] $ECONNRESET$
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/spam': (glob)
Traceback (most recent call last):
error: [Errno 104] $ECONNRESET$
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/spam/tip/foo': (glob)
Traceback (most recent call last):
error: [Errno 104] $ECONNRESET$
$ rm -f errors.log $ rm -f errors.log
Uncaught exceptions result in a logged error and canned HTTP response Uncaught exceptions result in a logged error and canned HTTP response
$ hg serve --config extensions.hgweberror=$TESTDIR/hgweberror.py -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ hg serve --config extensions.hgweberror=$TESTDIR/hgweberror.py -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ get-with-headers.py localhost:$HGPORT 'raiseerror' transfer-encoding content-type $ get-with-headers.py localhost:$HGPORT 'raiseerror' transfer-encoding content-type