diff options
author | Jamie Matthews <jamie.matthews@gmail.com> | 2017-11-15 13:17:13 +0000 |
---|---|---|
committer | Jamie Matthews <jamie.matthews@gmail.com> | 2017-11-15 13:17:13 +0000 |
commit | 1296b0caf072a3a3ed38b17c691b067813cb1035 (patch) | |
tree | 3dc21d3ad3e17c4f6f7e4302b8a39d66fce69676 | |
parent | fceb32bc57c26efbbf23a4ce61c6f38d0e6282b1 (diff) | |
download | waitress-1296b0caf072a3a3ed38b17c691b067813cb1035.tar.gz |
Use separate named logger for queue depth
-rw-r--r-- | waitress/task.py | 4 | ||||
-rw-r--r-- | waitress/tests/test_task.py | 6 | ||||
-rw-r--r-- | waitress/utilities.py | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/waitress/task.py b/waitress/task.py index 13f9b21..76c4d2d 100644 --- a/waitress/task.py +++ b/waitress/task.py @@ -29,6 +29,7 @@ from waitress.compat import ( from waitress.utilities import ( build_http_date, logger, + queue_logger, ) rename_headers = { # or keep them without the HTTP_ prefix added @@ -55,6 +56,7 @@ class ThreadedTaskDispatcher(object): """ stop_count = 0 # Number of threads that will stop soon. logger = logger + queue_logger = queue_logger def __init__(self): self.threads = {} # { thread number -> 1 } @@ -110,7 +112,7 @@ class ThreadedTaskDispatcher(object): def add_task(self, task): queue_depth = self.queue.qsize() if queue_depth > 0: - self.logger.warning( + self.queue_logger.warning( "Task queue depth is %d" % queue_depth) try: diff --git a/waitress/tests/test_task.py b/waitress/tests/test_task.py index 4dc3af0..2f6c842 100644 --- a/waitress/tests/test_task.py +++ b/waitress/tests/test_task.py @@ -68,11 +68,11 @@ class TestThreadedTaskDispatcher(unittest.TestCase): def test_log_queue_depth(self): task = DummyTask() inst = self._makeOne() - inst.logger = DummyLogger() + inst.queue_logger = DummyLogger() inst.add_task(task) - self.assertEqual(len(inst.logger.logged), 0) + self.assertEqual(len(inst.queue_logger.logged), 0) inst.add_task(task) - self.assertEqual(len(inst.logger.logged), 1) + self.assertEqual(len(inst.queue_logger.logged), 1) def test_add_task_defer_raises(self): task = DummyTask(ValueError) diff --git a/waitress/utilities.py b/waitress/utilities.py index 943c92f..29f517c 100644 --- a/waitress/utilities.py +++ b/waitress/utilities.py @@ -24,6 +24,7 @@ import time import calendar logger = logging.getLogger('waitress') +queue_logger = logging.getLogger('waitress.queue') def find_double_newline(s): """Returns the position just after a double newline in the given string.""" |