demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[astro] Trigger or not jobs restart when a positional channel is linked or unlinked (#9104)

Browse Source 
Don't rely on calls to channelLinked at startup

Related to openhab/openhab-core#1707

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2020-11-23 19:17:18 +01:00 committed by GitHub
parent 9de9955c49
commit ba98ef30e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java
View File

@ -82,7 +82,7 @@ public abstract class AstroThingHandler extends BaseThingHandler {
private final Set<ScheduledFuture<?>> scheduledFutures = new HashSet<>();
private int linkedPositionalChannels = 0;
private boolean linkedPositionalChannels;
protected AstroThingConfig thingConfig = new AstroThingConfig();
@ -204,7 +204,8 @@ public abstract class AstroThingHandler extends BaseThingHandler {
// Repeat positional job every configured seconds
// Use scheduleAtFixedRate to avoid time drift associated with scheduleWithFixedDelay
if (isPositionalChannelLinked()) {
linkedPositionalChannels = isPositionalChannelLinked();
if (linkedPositionalChannels) {
Job positionalJob = new PositionalJob(thingUID);
ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(positionalJob, 0, thingConfig.interval,
TimeUnit.SECONDS);
@ -244,23 +245,23 @@ public abstract class AstroThingHandler extends BaseThingHandler {
@Override
public void channelLinked(ChannelUID channelUID) {
linkedChannelChange(channelUID, 1);
linkedChannelChange(channelUID);
publishChannelIfLinked(channelUID);
}
@Override
public void channelUnlinked(ChannelUID channelUID) {
linkedChannelChange(channelUID, -1);
linkedChannelChange(channelUID);
}
/**
* Counts positional channels and restarts Astro jobs.
*/
private void linkedChannelChange(ChannelUID channelUID, int step) {
private void linkedChannelChange(ChannelUID channelUID) {
if (Arrays.asList(getPositionalChannelIds()).contains(channelUID.getId())) {
int oldValue = linkedPositionalChannels;
linkedPositionalChannels += step;
if (oldValue == 0 && linkedPositionalChannels > 0 || oldValue > 0 && linkedPositionalChannels == 0) {
boolean oldValue = linkedPositionalChannels;
linkedPositionalChannels = isPositionalChannelLinked();
if (oldValue != linkedPositionalChannels) {
restartJobs();
}
}