Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix MDC tag 'rule' #198

Merged
merged 1 commit into from
Mar 20, 2024
Merged

fix MDC tag 'rule' #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/openhab/automation/jrule/internal/engine/JRuleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -148,7 +149,7 @@ public boolean build() {
uid = UUID.randomUUID().toString();
}

if (logName == null) {
if (StringUtils.isEmpty(logName)) {
logName = ruleName;
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/openhab/automation/jrule/internal/engine/JRuleEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/openhab/automation/jrule/rules/integration_test/ITJRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/openhab/automation/jrule/rules/user/TestRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
47 changes: 1 addition & 46 deletions src/test/resources/docker/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Loading