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

[pidcontroller] Improve logging #11312

Merged
merged 1 commit into from
Sep 27, 2021
Merged

[pidcontroller] Improve logging #11312

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
16 changes: 11 additions & 5 deletions ...va/org/openhab/automation/pidcontroller/internal/handler/PIDControllerTriggerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ public class PIDControllerTriggerHandler extends BaseTriggerModuleHandler implem
private @Nullable String iInspector;
private @Nullable String dInspector;
private @Nullable String eInspector;
private ItemRegistry itemRegistry;

public PIDControllerTriggerHandler(Trigger module, ItemRegistry itemRegistry, EventPublisher eventPublisher,
BundleContext bundleContext) {
super(module);
this.itemRegistry = itemRegistry;
this.eventPublisher = eventPublisher;

Configuration config = module.getConfiguration();
Expand Down Expand Up @@ -154,14 +156,14 @@ private void calculate() {
try {
input = getItemValueAsNumber(inputItem);
} catch (PIDException e) {
logger.warn("Input item: {}", e.getMessage());
logger.warn("Input item: {}: {}", inputItem.getName(), e.getMessage());
return;
}

try {
setpoint = getItemValueAsNumber(setpointItem);
} catch (PIDException e) {
logger.warn("Setpoint item: {}", e.getMessage());
logger.warn("Setpoint item: {}: {}", setpointItem.getName(), e.getMessage());
return;
}

Expand All @@ -180,7 +182,12 @@ private void calculate() {

private void updateItem(@Nullable String itemName, double value) {
if (itemName != null) {
eventPublisher.post(ItemEventFactory.createCommandEvent(itemName, new DecimalType(value)));
try {
itemRegistry.getItem(itemName);
eventPublisher.post(ItemEventFactory.createCommandEvent(itemName, new DecimalType(value)));
} catch (ItemNotFoundException e) {
logger.warn("Item doesn't exist: {}", itemName);
}
}
}

Expand Down Expand Up @@ -209,8 +216,7 @@ private double getItemValueAsNumber(Item item) throws PIDException {
// nothing
}
}
throw new PIDException(
"Item type is not a number: " + setpointState.getClass().getSimpleName() + ": " + setpointState);
throw new PIDException("Not a number: " + setpointState.getClass().getSimpleName() + ": " + setpointState);
}

@Override
Expand Down