diff options
| author | Michael Merickel <michael@merickel.org> | 2019-04-04 00:00:43 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2019-04-04 00:00:43 -0500 |
| commit | 7c0a30889f16d084a3ff3979cd4691f9f3423d14 (patch) | |
| tree | a1bfcf2d0078dd4b4047b4152e3c71ce5a4181f0 | |
| parent | 1d074940637a3caa13110b53a523ea9164c4ac28 (diff) | |
| download | waitress-7c0a30889f16d084a3ff3979cd4691f9f3423d14.tar.gz | |
degrade client disconnect to info not warn
| -rw-r--r-- | waitress/channel.py | 7 | ||||
| -rw-r--r-- | waitress/tests/test_channel.py | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/waitress/channel.py b/waitress/channel.py index 84abce5..5af549e 100644 --- a/waitress/channel.py +++ b/waitress/channel.py @@ -205,8 +205,7 @@ class HTTPChannel(wasyncore.dispatcher, object): def _flush_some_if_lockable(self): # Since our task may be appending to the outbuf, we try to acquire # the lock, but we don't block if we can't. - locked = self.outbuf_lock.acquire(False) - if locked: + if self.outbuf_lock.acquire(False): try: self._flush_some() finally: @@ -335,11 +334,11 @@ class HTTPChannel(wasyncore.dispatcher, object): try: task.service() except ClientDisconnected: - self.logger.warn('Client disconnected when serving %s' % + self.logger.info('Client disconnected while serving %s' % task.request.path) task.close_on_finish = True except: - self.logger.exception('Exception when serving %s' % + self.logger.exception('Exception while serving %s' % task.request.path) if not task.wrote_header: if self.adj.expose_tracebacks: diff --git a/waitress/tests/test_channel.py b/waitress/tests/test_channel.py index 1eada4b..3915af9 100644 --- a/waitress/tests/test_channel.py +++ b/waitress/tests/test_channel.py @@ -570,7 +570,7 @@ class TestHTTPChannel(unittest.TestCase): inst.service() self.assertTrue(request.serviced) self.assertEqual(inst.requests, []) - self.assertEqual(len(inst.logger.warnings), 1) + self.assertEqual(len(inst.logger.infos), 1) self.assertTrue(inst.server.trigger_pulled) self.assertTrue(inst.last_activity) self.assertFalse(inst.will_close) @@ -596,7 +596,7 @@ class TestHTTPChannel(unittest.TestCase): self.assertTrue(err_request.serviced) self.assertEqual(inst.requests, []) self.assertEqual(len(inst.logger.exceptions), 1) - self.assertEqual(len(inst.logger.warnings), 0) + self.assertEqual(len(inst.logger.infos), 0) self.assertTrue(inst.server.trigger_pulled) self.assertTrue(inst.last_activity) self.assertFalse(inst.will_close) @@ -741,10 +741,11 @@ class DummyLogger(object): def __init__(self): self.exceptions = [] + self.infos = [] self.warnings = [] - def warn(self, msg): - self.warnings.append(msg) + def info(self, msg): + self.infos.append(msg) def exception(self, msg): self.exceptions.append(msg) |