Synchronized Weather cache update requests (openhab#16572)

Signed-off-by: clinique <gael@lhopital.org>
matchews · Oct 18, 2024 · 66d82ac · 66d82ac
1 parent cea0d5f
commit 66d82ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/AirCareCapability.java b/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/AirCareCapability.java
@@ -41,7 +41,7 @@ protected List<NAObject> updateReadings(AircareApi api) {
         try {
             return List.of(api.getHomeCoach(handler.getId()));
         } catch (NetatmoException e) {
-            logger.warn("Error retrieving home-coach data '{}' : {}", handler.getId(), e.getMessage());
+            logger.warn("Error retrieving home-coach data '{}': {}", handler.getId(), e.getMessage());
         }
         return List.of();
     }

diff --git a/.../java/org/openhab/binding/netatmo/internal/handler/capability/CacheWeatherCapability.java b/.../java/org/openhab/binding/netatmo/internal/handler/capability/CacheWeatherCapability.java
@@ -43,13 +43,16 @@ public CacheWeatherCapability(CommonInterface handler, Duration validity) {
     }
 
     @Override
-    protected List<NAObject> updateReadings(WeatherApi api) {
+    protected synchronized List<NAObject> updateReadings(WeatherApi api) {
         Instant now = Instant.now();
 
         if (requestTS.plus(validity).isBefore(now)) {
-            logger.debug("Requesting fresh data");
-            lastResult = getFreshData(api);
-            requestTS = now;
+            logger.debug("{} requesting fresh data for {}", getClass().getSimpleName(), thingUID);
+            List<NAObject> result = getFreshData(api);
+            if (!result.isEmpty()) {
+                lastResult = result;
+                requestTS = now;
+            }
         }
 
         return lastResult;

diff --git a/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/WeatherCapability.java b/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/WeatherCapability.java
@@ -42,7 +42,7 @@ protected List<NAObject> getFreshData(WeatherApi api) {
         try {
             return List.of(owned ? api.getOwnedStationData(handler.getId()) : api.getStationData(handler.getId()));
         } catch (NetatmoException e) {
-            logger.warn("Error retrieving weather data '{}' : {}", handler.getId(), e.getMessage());
+            logger.warn("Error retrieving weather data '{}': {}", handler.getId(), e.getMessage());
         }
         return List.of();
     }