Merge pull request #10 from xprojects-de/development

Development
xprojects-de · Oct 23, 2020 · ac738d9 · ac738d9
2 parents 4226679 + 7e47046
commit ac738d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>x</groupId>
   <artifactId>Alpdesk-Automationservice</artifactId>
-  <version>2.2.3</version>
+  <version>2.2.4</version>
 
   <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.13</artifactId>
-      <version>2.6.9</version>
+      <version>2.6.10</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/src/main/java/x/Devices/RemoteDevice.java b/src/main/java/x/Devices/RemoteDevice.java
@@ -9,7 +9,6 @@ public class RemoteDevice extends BaseDevice {
   private final Logger logger = LoggerFactory.getLogger(RemoteDevice.class);
   RemoteAccessRequest request = null;
   public boolean activ = false;
-  private int retryCounter = 0;
 
   public RemoteDevice(boolean activ, String url, int cycleTime, String jwt) {
     super(cycleTime);
@@ -23,22 +22,13 @@ public void receiveIdle() {
       try {
         boolean response = request.execute();
         if (response == false) {
-          retryCounter++;
-          if (retryCounter >= 100) {
-            activ = false;
-            logger.info("Deaktivating RemoteAccess in response!");
-          }
+          logger.error("Error sending RemoteRequest");
         } else {
-          retryCounter = 0;
           logger.debug("REMOTE " + response);
         }
       } catch (Exception ex) {
-        retryCounter++;
-        if (retryCounter >= 100) {
-          activ = false;
-          logger.info("Deaktivating RemoteAccess in Exception!");
-          logger.error(ex.getMessage());
-        }
+        logger.error("Error sending RemoteRequest");
+        logger.error(ex.getMessage());
       }
     }
   }

diff --git a/src/main/java/x/main/XHomeautomationMain.java b/src/main/java/x/main/XHomeautomationMain.java
@@ -31,7 +31,7 @@ public class XHomeautomationMain implements ApplicationRunner {
 
   Logger logger = LoggerFactory.getLogger(XHomeautomationMain.class);
 
-  public static final String VERSION = "2.2.3";
+  public static final String VERSION = "2.2.4";
 
   @Autowired
   RetainProcess retainProcess;