=== modified file 'twisted/python/log.py'
|
|
|
|
| 529 | 530 | text = textFromEventDict(eventDict) |
| 530 | 531 | if text is None: |
| 531 | 532 | return |
| 532 | | self.logger.log(level, text) |
| | 533 | # 'message' key is not allowed in the extra dict |
| | 534 | del eventDict['message'] |
| | 535 | self.logger.log(level, text, extra=eventDict) |
| 533 | 536 | |
| 534 | 537 | def start(self): |
| 535 | 538 | """ |
=== modified file 'twisted/test/test_log.py'
|
|
|
|
| 607 | 607 | self.lp.msg(message='', isError=False) |
| 608 | 608 | self.assertEqual(self.out.getvalue(), '') |
| 609 | 609 | |
| | 610 | def test_extraEventDict(self): |
| | 611 | """ |
| | 612 | Verify that extra eventDict data is passed to stdlib logging as extras. |
| | 613 | """ |
| | 614 | self.hdlr.setFormatter(logging.Formatter(fmt="%(message)s %(foo)s")) |
| | 615 | self.lp.msg("Hello World", foo="bar") |
| | 616 | |
| | 617 | self.assertIn("Hello World", self.out.getvalue()) |
| | 618 | self.assertIn("bar", self.out.getvalue()) |
| 610 | 619 | |
| 611 | 620 | class PythonLoggingIntegrationTestCase(unittest.TestCase): |
| 612 | 621 | """ |
