Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix use search instead of match to filter logs (#49017)

pull/49139/head
Franck Nijhof 2021-04-10 22:03:44 +02:00 committed by Paulus Schoutsen
parent 0a5a5ff053
commit e3b3d136d8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/logger/__init__.py
View File

@ -114,7 +114,7 @@ def _add_log_filter(logger, patterns):
"""Add a Filter to the logger based on a regexp of the filter_str.""" """Add a Filter to the logger based on a regexp of the filter_str."""
def filter_func(logrecord): def filter_func(logrecord):
return not any(p.match(logrecord.getMessage()) for p in patterns) return not any(p.search(logrecord.getMessage()) for p in patterns)
logger.addFilter(filter_func) logger.addFilter(filter_func)

2
tests/components/logger/test_init.py
View File

@ -42,6 +42,7 @@ async def test_log_filtering(hass, caplog):
"doesntmatchanything", "doesntmatchanything",
".*shouldfilterall.*", ".*shouldfilterall.*",
"^filterthis:.*", "^filterthis:.*",
"in the middle",
], ],
"test.other_filter": [".*otherfilterer"], "test.other_filter": [".*otherfilterer"],
}, },
@ -62,6 +63,7 @@ async def test_log_filtering(hass, caplog):
filter_logger, False, "this line containing shouldfilterall should be filtered" filter_logger, False, "this line containing shouldfilterall should be filtered"
) )
msg_test(filter_logger, True, "this line should not be filtered filterthis:") msg_test(filter_logger, True, "this line should not be filtered filterthis:")
msg_test(filter_logger, False, "this in the middle should be filtered")
msg_test(filter_logger, False, "filterthis: should be filtered") msg_test(filter_logger, False, "filterthis: should be filtered")
msg_test(filter_logger, False, "format string shouldfilter%s", "all") msg_test(filter_logger, False, "format string shouldfilter%s", "all")
msg_test(filter_logger, True, "format string shouldfilter%s", "not") msg_test(filter_logger, True, "format string shouldfilter%s", "not")