evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix script logging with name (#33120)

Browse source
This commit is contained in:
Paulus Schoutsen 2020-03-22 05:29:50 -07:00 • committed by GitHub
parent 66402b9b38
commit f95c3e265d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/helpers/script.py
View file

@ -817,7 +817,9 @@ class Script:
def _log(self, msg, *args, level=logging.INFO): def _log(self, msg, *args, level=logging.INFO):
if self.name: if self.name:
msg = f"{self.name}: {msg}" msg = f"%s: {msg}"
args = [self.name, *args]
if level == _LOG_EXCEPTION: if level == _LOG_EXCEPTION:
self._logger.exception(msg, *args) self._logger.exception(msg, *args)
else: else:

12
tests/helpers/test_script.py
View file

@ -1138,3 +1138,15 @@ async def test_script_mode_queue(hass):
assert not script_obj.is_running assert not script_obj.is_running
assert len(events) == 4 assert len(events) == 4
assert events[3].data["value"] == 2 assert events[3].data["value"] == 2
async def test_script_logging(caplog):
"""Test script logging."""
script_obj = script.Script(None, [], "Script with % Name")
script_obj._log("Test message with name %s", 1)
assert "Script with % Name: Test message with name 1" in caplog.text
script_obj = script.Script(None, [])
script_obj._log("Test message without name %s", 2)
assert "Test message without name 2" in caplog.text