From a61d154fa333ba9bdff0431e7d4ea6d1c6b3b26e Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Sun, 25 Apr 2021 16:43:03 -0700 Subject: [PATCH] proxy: Downgrade some client problems to info There's no good reason for us to log client behaviors like closed sockets or slow reads at warning -- there's little if anything an operator can do about it. Change-Id: Ic2eabdce4477061e30dca52ad38f562cb6750001 --- swift/proxy/controllers/base.py | 6 +++--- test/unit/proxy/controllers/test_base.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py index 0ed01c313d..bb4504c3d3 100644 --- a/swift/proxy/controllers/base.py +++ b/swift/proxy/controllers/base.py @@ -1312,7 +1312,7 @@ class GetOrHeadHandler(object): _('Trying to read during GET')) raise except ChunkWriteTimeout: - self.app.logger.warning( + self.app.logger.info( _('Client did not read from proxy within %ss') % self.app.client_timeout) self.app.logger.increment('client_timeouts') @@ -1327,8 +1327,8 @@ class GetOrHeadHandler(object): if end - begin + 1 == self.bytes_used_from_backend: warn = False if not req.environ.get('swift.non_client_disconnect') and warn: - self.app.logger.warning('Client disconnected on read of %r', - self.path) + self.app.logger.info('Client disconnected on read of %r', + self.path) raise except Exception: self.app.logger.exception(_('Trying to send to client')) diff --git a/test/unit/proxy/controllers/test_base.py b/test/unit/proxy/controllers/test_base.py index c60262a1a9..9387f9f122 100644 --- a/test/unit/proxy/controllers/test_base.py +++ b/test/unit/proxy/controllers/test_base.py @@ -1243,7 +1243,7 @@ class TestFuncs(BaseTest): client_chunks = list(app_iter) self.assertEqual(client_chunks, [b'abcd1234', b'efgh5678']) - def test_disconnected_warning(self): + def test_disconnected_logging(self): self.app.logger = mock.Mock() req = Request.blank('/v1/a/c/o') @@ -1270,7 +1270,7 @@ class TestFuncs(BaseTest): 'some-path', {}) app_iter = handler._make_app_iter(req, node, source) app_iter.close() - self.app.logger.warning.assert_called_once_with( + self.app.logger.info.assert_called_once_with( 'Client disconnected on read of %r', 'some-path') self.app.logger = mock.Mock()