Merge pull request #198 from querdenker2k/fix-rule-mdc-tag

fix MDC tag 'rule'
seaside1 · Mar 20, 2024 · 4fb627d · 4fb627d
2 parents 98c25c1 + 768d1a2
commit 4fb627d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 49 deletions.
diff --git a/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleBuilder.java b/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleBuilder.java
@@ -21,6 +21,7 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.automation.jrule.internal.engine.excutioncontext.JRuleChannelExecutionContext;
 import org.openhab.automation.jrule.internal.engine.excutioncontext.JRuleItemChangeExecutionContext;
@@ -148,7 +149,7 @@ public boolean build() {
             uid = UUID.randomUUID().toString();
         }
 
-        if (logName == null) {
+        if (StringUtils.isEmpty(logName)) {
             logName = ruleName;
         }
 

diff --git a/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java b/src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java
@@ -512,11 +512,12 @@ public JRuleBuilder createJRuleBuilder(String ruleName, JRule jRule, Method meth
                 } else {
                     method.invoke(jRule);
                 }
-            } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
-                logError("Error calling rule method: {}", ExceptionUtils.getStackTrace(e));
             } catch (InvocationTargetException e) {
                 logError("Error in rule: {}\ntarget: {}", ExceptionUtils.getStackTrace(e),
                         ExceptionUtils.getStackTrace(e.getCause()));
+            } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
+                logError("Error calling rule method '{}#{}': {}", method.getDeclaringClass().getName(),
+                        method.getName(), ExceptionUtils.getStackTrace(e));
             }
         }).uid(JRuleModuleEntry.createUid(jRule, method));
     }

diff --git a/src/test/java/org/openhab/automation/jrule/rules/integration_test/ITJRule.java b/src/test/java/org/openhab/automation/jrule/rules/integration_test/ITJRule.java
@@ -34,6 +34,7 @@ public void switchItemReceiveCommand() throws IOException {
         verifyRuleWasExecuted(TestRules.NAME_SWITCH_ITEM_RECEIVED_ANY_COMMAND);
         verifyRuleWasExecuted(TestRules.NAME_SWITCH_ITEM_RECEIVED_ANY_UPDATE);
         verifyRuleWasExecuted(TestRules.NAME_SWITCH_ITEM_CHANGED);
+        verifyLogEntry("[%s/%s]".formatted(TestRules.NAME_SWITCH_ITEM_RECEIVED_ANY_COMMAND, TestRules.TAG_CUSTOM));
     }
 
     @Test

diff --git a/src/test/java/org/openhab/automation/jrule/rules/user/TestRules.java b/src/test/java/org/openhab/automation/jrule/rules/user/TestRules.java
@@ -142,7 +142,9 @@ public class TestRules extends JRule {
     public static final String COMMAND_GROUPS = "groups";
     public static final String NAME_TRIGGER_ON_GROUP_STATE_CHANGE = "trigger on group state change";
     public static final String ITEM_SWITCH_GROUP_OR = "SwitchGroupOr";
+    public static final String TAG_CUSTOM = "custom";
 
+    @JRuleTag({ TAG_CUSTOM })
     @JRuleName(NAME_SWITCH_ITEM_RECEIVED_ANY_COMMAND)
     @JRuleWhenItemReceivedCommand(item = ITEM_RECEIVING_COMMAND_SWITCH)
     public void switchItemReceivedCommand(JRuleItemEvent event) {

diff --git a/src/test/resources/docker/log4j2.xml b/src/test/resources/docker/log4j2.xml
@@ -3,61 +3,16 @@
 	<Appenders>
 		<!-- Console appender not used by default (see Root logger AppenderRefs) -->
 		<Console name="STDOUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%X{rule}/%X{custom}] [%-5.5p] [%-36.36c] - %m%n"/>
 		</Console>
-
-		<!-- Rolling file appender -->
-		<RollingFile fileName="${sys:openhab.logdir}/openhab.log" filePattern="${sys:openhab.logdir}/openhab.log.%i.gz" name="LOGFILE">
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{heating}, %X{car}] [%-5.5p] [%-36.36c] - %m%n"/>
-			<Policies>
-				<OnStartupTriggeringPolicy/>
-				<SizeBasedTriggeringPolicy size="16 MB"/>
-			</Policies>
-			<DefaultRolloverStrategy max="7"/>
-		</RollingFile>
-
-		<!-- Event log appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/events.log" filePattern="${sys:openhab.logdir}/events.log.%i.gz" name="EVENT">
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
-			<Policies>
-				<OnStartupTriggeringPolicy/>
-				<SizeBasedTriggeringPolicy size="16 MB"/>
-			</Policies>
-			<DefaultRolloverStrategy max="7"/>
-		</RollingRandomAccessFile>
-
-		<!-- Audit file appender -->
-		<RollingRandomAccessFile fileName="${sys:openhab.logdir}/audit.log" filePattern="${sys:openhab.logdir}/audit.log.%i.gz" name="AUDIT">
-			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5.5p] [%-36.36c] - %m%n"/>
-			<Policies>
-				<OnStartupTriggeringPolicy/>
-				<SizeBasedTriggeringPolicy size="8 MB"/>
-			</Policies>
-			<DefaultRolloverStrategy max="7"/>
-		</RollingRandomAccessFile>
-
-		<!-- OSGi appender -->
-		<PaxOsgi filter="*" name="OSGI"/>
 	</Appenders>
 
 	<Loggers>
 		<!-- Root logger configuration -->
 		<Root level="WARN">
-			<AppenderRef ref="LOGFILE"/>
-			<AppenderRef ref="OSGI"/>
 			<AppenderRef ref="STDOUT"/>
 		</Root>
 
-		<!-- Karaf Shell logger -->
-		<Logger level="OFF" name="org.apache.karaf.shell.support">
-			<AppenderRef ref="STDOUT"/>
-		</Logger>
-
-		<!-- Security audit logger -->
-		<Logger additivity="false" level="INFO" name="org.apache.karaf.jaas.modules.audit">
-			<AppenderRef ref="AUDIT"/>
-		</Logger>
-
 		<!-- openHAB specific logger configuration -->
 
 		<Logger level="INFO" name="org.openhab"/>