public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix excessive firmware version updates (#13155)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2022-07-21 19:32:42 +02:00 committed by GitHub
parent 572d1ec6f0
commit 0577ee8ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
View File

@ -12,6 +12,8 @@
*/ */
package org.openhab.binding.hdpowerview.internal.handler; package org.openhab.binding.hdpowerview.internal.handler;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -82,6 +84,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
private final HttpClient httpClient; private final HttpClient httpClient;
private final HDPowerViewTranslationProvider translationProvider; private final HDPowerViewTranslationProvider translationProvider;
private final ConcurrentHashMap<ThingUID, ShadeData> pendingShadeInitializations = new ConcurrentHashMap<>(); private final ConcurrentHashMap<ThingUID, ShadeData> pendingShadeInitializations = new ConcurrentHashMap<>();
private final Duration firmwareVersionValidityPeriod = Duration.ofDays(1);
private long refreshInterval; private long refreshInterval;
private long hardRefreshPositionInterval; private long hardRefreshPositionInterval;
@ -95,7 +98,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
private List<Scene> sceneCache = new CopyOnWriteArrayList<>(); private List<Scene> sceneCache = new CopyOnWriteArrayList<>();
private List<SceneCollection> sceneCollectionCache = new CopyOnWriteArrayList<>(); private List<SceneCollection> sceneCollectionCache = new CopyOnWriteArrayList<>();
private List<ScheduledEvent> scheduledEventCache = new CopyOnWriteArrayList<>(); private List<ScheduledEvent> scheduledEventCache = new CopyOnWriteArrayList<>();
private @Nullable FirmwareVersions firmwareVersions; private Instant firmwareVersionsUpdated = Instant.MIN;
private Boolean deprecatedChannelsCreated = false; private Boolean deprecatedChannelsCreated = false;
private final ChannelTypeUID sceneChannelTypeUID = new ChannelTypeUID(HDPowerViewBindingConstants.BINDING_ID, private final ChannelTypeUID sceneChannelTypeUID = new ChannelTypeUID(HDPowerViewBindingConstants.BINDING_ID,
@ -141,6 +144,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
} }
} catch (HubMaintenanceException e) { } catch (HubMaintenanceException e) {
// exceptions are logged in HDPowerViewWebTargets // exceptions are logged in HDPowerViewWebTargets
firmwareVersionsUpdated = Instant.MIN;
} catch (NumberFormatException | HubException e) { } catch (NumberFormatException | HubException e) {
logger.debug("Unexpected error {}", e.getMessage()); logger.debug("Unexpected error {}", e.getMessage());
} }
@ -164,7 +168,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
hardRefreshPositionInterval = config.hardRefresh; hardRefreshPositionInterval = config.hardRefresh;
hardRefreshBatteryLevelInterval = config.hardRefreshBatteryLevel; hardRefreshBatteryLevelInterval = config.hardRefreshBatteryLevel;
initializeChannels(); initializeChannels();
firmwareVersions = null; firmwareVersionsUpdated = Instant.MIN;
updateStatus(ThingStatus.UNKNOWN); updateStatus(ThingStatus.UNKNOWN);
schedulePoll(); schedulePoll();
@ -304,15 +308,17 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
} }
} catch (HubMaintenanceException e) { } catch (HubMaintenanceException e) {
// exceptions are logged in HDPowerViewWebTargets // exceptions are logged in HDPowerViewWebTargets
firmwareVersionsUpdated = Instant.MIN;
} catch (HubException e) { } catch (HubException e) {
logger.warn("Error connecting to bridge: {}", e.getMessage()); logger.warn("Error connecting to bridge: {}", e.getMessage());
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage()); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
firmwareVersionsUpdated = Instant.MIN;
} }
} }
private void updateFirmwareProperties() private void updateFirmwareProperties()
throws HubInvalidResponseException, HubProcessingException, HubMaintenanceException { throws HubInvalidResponseException, HubProcessingException, HubMaintenanceException {
if (firmwareVersions != null) { if (firmwareVersionsUpdated.isAfter(Instant.now().minus(firmwareVersionValidityPeriod))) {
return; return;
} }
FirmwareVersions firmwareVersions = webTargets.getFirmwareVersions(); FirmwareVersions firmwareVersions = webTargets.getFirmwareVersions();
@ -334,6 +340,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler {
properties.put(HDPowerViewBindingConstants.PROPERTY_RADIO_FIRMWARE_VERSION, radio.toString()); properties.put(HDPowerViewBindingConstants.PROPERTY_RADIO_FIRMWARE_VERSION, radio.toString());
} }
updateProperties(properties); updateProperties(properties);
firmwareVersionsUpdated = Instant.now();
} }
private void pollShades() throws HubInvalidResponseException, HubProcessingException, HubMaintenanceException { private void pollShades() throws HubInvalidResponseException, HubProcessingException, HubMaintenanceException {