Improve log message to identify profile's link (#3568)

openhab · Apr 22, 2023 · bff92e0 · bff92e0
1 parent 7cf0901
commit bff92e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...script/src/main/java/org/openhab/core/automation/module/script/profile/ScriptProfile.java b/...script/src/main/java/org/openhab/core/automation/module/script/profile/ScriptProfile.java
@@ -76,7 +76,8 @@ public ScriptProfile(ProfileTypeUID profileTypeUID, ProfileCallback callback, Pr
 
         if (toItemScript.isBlank() && toHandlerScript.isBlank()) {
             logger.error(
-                    "Neither 'toItem' nor 'toHandler' script defined. Profile will discard all states and commands.");
+                    "Neither 'toItemScript' nor 'toHandlerScript' defined in link '{}'. Profile will discard all states and commands.",
+                    callback.getItemChannelLink());
             isConfigured = false;
             return;
         }

diff --git a/...pt/src/test/java/org/openhab/core/automation/module/script/profile/ScriptProfileTest.java b/...pt/src/test/java/org/openhab/core/automation/module/script/profile/ScriptProfileTest.java
@@ -40,6 +40,8 @@
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.PercentType;
 import org.openhab.core.test.java.JavaTest;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.link.ItemChannelLink;
 import org.openhab.core.thing.profiles.ProfileCallback;
 import org.openhab.core.thing.profiles.ProfileContext;
 import org.openhab.core.thing.profiles.ProfileTypeUID;
@@ -70,6 +72,9 @@ public void setUp() throws TransformationException {
     public void testScriptNotExecutedAndNoValueForwardedToCallbackIfNoScriptDefined() throws TransformationException {
         ProfileContext profileContext = ProfileContextBuilder.create().build();
 
+        ItemChannelLink link = new ItemChannelLink("DummyItem", new ChannelUID("foo:bar:baz:qux"));
+        when(profileCallback.getItemChannelLink()).thenReturn(link);
+
         setupInterceptedLogger(ScriptProfile.class, LogLevel.ERROR);
 
         ScriptProfile scriptProfile = new ScriptProfile(mock(ProfileTypeUID.class), profileCallback, profileContext,
@@ -85,7 +90,8 @@ public void testScriptNotExecutedAndNoValueForwardedToCallbackIfNoScriptDefined(
         verify(profileCallback, never()).sendCommand(any());
 
         assertLogMessage(ScriptProfile.class, LogLevel.ERROR,
-                "Neither 'toItem' nor 'toHandler' script defined. Profile will discard all states and commands.");
+                "Neither 'toItemScript' nor 'toHandlerScript' defined in link '" + link.toString()
+                        + "'. Profile will discard all states and commands.");
     }
 
     @Test