[TapoCamera] added reconnect when encryption key is incorrect, added …

…thing label for logging Signed-off-by: Dmitry P. (d51x) <[email protected]>
d51x · Dec 24, 2023 · 62b2d8c · 62b2d8c
1 parent 2be2c24
commit 62b2d8c
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 69 deletions.
diff --git a/src/main/java/org/openhab/binding/tapocamera/internal/TapoCameraHandler.java b/src/main/java/org/openhab/binding/tapocamera/internal/TapoCameraHandler.java
@@ -293,7 +293,7 @@ private void getSupportedFeatures(ModuleSpec moduleSpec) {
     }
 
     private Future<?> connectCamera(int wait) {
-        logger.warn("Try connect after: {} sec", wait);
+        logger.warn("{}: Try connect after: {} sec", thing.getLabel(), wait);
         return scheduler.schedule(() -> {
             updateStatus(ThingStatus.OFFLINE);
             boolean thingReachable = deviceAuth();
@@ -319,10 +319,14 @@ private Future<?> connectCamera(int wait) {
     }
 
     private void reconnect() {
-        logger.debug("Try to reconnect");
+        reconnect("");
+    }
+
+    private void reconnect(@Nullable String message) {
+        logger.debug("{}: Try to reconnect", thing.getLabel());
         cancelInitJob();
         cancelPollingJob();
-        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
+        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, message);
         initJob = connectCamera(config.reconnectInterval);
     }
 
@@ -332,7 +336,7 @@ private Boolean deviceAuth() {
             return api.auth(config.username, pass);
         } catch (ApiException e) {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
-            reconnect();
+            reconnect(e.getMessage());
             throw new RuntimeException(e);
         }
     }
@@ -368,7 +372,7 @@ private Future<?> getCameraParameters(Integer interval) {
     }
 
     private void pollingCamera() {
-        logger.debug("get camera parameters");
+        logger.debug("{}: get camera parameters", thing.getLabel());
         try {
             if (!api.isAuth()) {
                 reconnect();
@@ -381,7 +385,9 @@ private void pollingCamera() {
             }
 
         } catch (Exception e) {
-            logger.error("Tapo Camera Exception: {}", e.getMessage());
+            logger.error("{}: Tapo Camera Exception: {}", thing.getLabel(), e.getMessage());
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
+            reconnect();
         }
     }
 
@@ -560,7 +566,7 @@ else if (data instanceof LastAlarmInfo) {
     public @Nullable StateDescription getStateDescription(Channel channel, @Nullable StateDescription stateDescription,
             @Nullable Locale locale) {
         if (this.getThing().getChannel(CHANNEL_GOTO_PRESETS.getName()).equals(channel)) {
-            logger.debug("requested state for {}", channel.getUID());
+            logger.debug("{}: requested state for {}", thing.getLabel(), channel.getUID());
         }
         return null;
     }

diff --git a/src/main/java/org/openhab/binding/tapocamera/internal/TapoCameraHandlerFactory.java b/src/main/java/org/openhab/binding/tapocamera/internal/TapoCameraHandlerFactory.java
@@ -68,7 +68,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
     protected @Nullable ThingHandler createHandler(Thing thing) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
-        TapoCameraApi api = apiFactory.getApi();
+        TapoCameraApi api = apiFactory.getApi(thing.getLabel());
         if (THING_TYPE_CAMERA.equals(thingTypeUID)) {
             return new TapoCameraHandler(thing, api);
         } else if (THING_TYPE_BRIDGE.equals(thingTypeUID)) {

diff --git a/src/main/java/org/openhab/binding/tapocamera/internal/api/TapoCameraApiFactory.java b/src/main/java/org/openhab/binding/tapocamera/internal/api/TapoCameraApiFactory.java
@@ -77,8 +77,8 @@ public TapoCameraApiFactory() {
      *
      * @return the api
      */
-    public TapoCameraApi getApi() {
-        return new TapoCameraApiImpl(httpClient);
+    public TapoCameraApi getApi(String tag) {
+        return new TapoCameraApiImpl(httpClient, tag);
     }
 
     public TapoCameraCloudApi getCloudApi() {