demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Improve log messages in ItemStateConditionHandler (#3535)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K
2023-04-09 11:45:00 +02:00
committed by GitHub
parent 26daabce9c
commit 643fe49f8a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandler.java
+11 -10
View File
@@ -126,12 +126,13 @@ public class ItemStateConditionHandler extends BaseConditionModuleHandler implem
String state = (String) module.getConfiguration().get(STATE);
String operator = (String) module.getConfiguration().get(OPERATOR);
if (operator == null || state == null || itemName == null) {
logger.error("Module is not well configured: itemName={} operator={} state = {}", itemName, operator,
state);
logger.error("Module is not well configured: itemName={} operator={} state = {} for rule {}", itemName,
operator, state, ruleUID);
return false;
}
try {
logger.debug("ItemStateCondition '{}' checking if {} {} {}", module.getId(), itemName, operator, state);
logger.debug("ItemStateCondition '{}' checking if {} {} {} for rule {}", module.getId(), itemName, operator,
state, ruleUID);
switch (operator) {
case "=":
return equalsToItemState(itemName, state);
@@ -149,7 +150,7 @@ public class ItemStateConditionHandler extends BaseConditionModuleHandler implem
return greaterThanOrEqualsToItemState(itemName, state);
}
} catch (ItemNotFoundException e) {
logger.error("Item with name {} not found in ItemRegistry.", itemName);
logger.error("Item with name {} not found in ItemRegistry for condition of rule {}.", itemName, ruleUID);
}
return false;
}
@@ -170,8 +171,8 @@ public class ItemStateConditionHandler extends BaseConditionModuleHandler implem
// state, but warn the user
if (!Units.ONE.equals(qtState.getUnit())) {
logger.warn(
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), please consider adding a unit to the condition.",
qtState, itemName, state);
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), please consider adding a unit to the condition for rule {}.",
qtState, itemName, state, ruleUID);
}
return qtState.compareTo(
new QuantityType<>(((DecimalType) compareState).toBigDecimal(), qtState.getUnit())) <= 0;
@@ -209,8 +210,8 @@ public class ItemStateConditionHandler extends BaseConditionModuleHandler implem
// state, but warn the user
if (!Units.ONE.equals(qtState.getUnit())) {
logger.warn(
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), please consider adding a unit to the condition.",
qtState, itemName, state);
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), please consider adding a unit to the condition for rule {}.",
qtState, itemName, state, ruleUID);
}
return qtState.compareTo(
new QuantityType<>(((DecimalType) compareState).toBigDecimal(), qtState.getUnit())) >= 0;
@@ -245,8 +246,8 @@ public class ItemStateConditionHandler extends BaseConditionModuleHandler implem
} else {
// log a warning if the unit of the state differs from ONE
logger.warn(
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), comparison will fail unless a unit is added to the condition.",
itemState, itemName, state);
"Received a QuantityType state '{}' with unit for item {}, but the condition is defined as a plain number without unit ({}), comparison will fail unless a unit is added to the condition for rule {}.",
itemState, itemName, state, ruleUID);
return false;
}
}