From f95c3e265d7197186607fcd194ced3bb245c4f87 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 22 Mar 2020 05:29:50 -0700
Subject: [PATCH] Fix script logging with name (#33120)
---
homeassistant/helpers/script.py | 4 +++-
tests/helpers/test_script.py | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 7d1088eebe4..145bb42af5b 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -817,7 +817,9 @@ class Script:
def _log(self, msg, *args, level=logging.INFO):
if self.name:
- msg = f"{self.name}: {msg}"
+ msg = f"%s: {msg}"
+ args = [self.name, *args]
+
if level == _LOG_EXCEPTION:
self._logger.exception(msg, *args)
else:
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index eb1d5e15020..9d7e7751c10 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -1138,3 +1138,15 @@ async def test_script_mode_queue(hass):
assert not script_obj.is_running
assert len(events) == 4
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
--
GitLab