Jelajahi Sumber

Fix Push to Senslog V1

Lukas Cerny 6 tahun lalu
induk
melakukan
964ea7ac11

+ 2 - 2
config/lorawanSenslog1.yaml

@@ -25,8 +25,8 @@ settings:
         name: "Senslog V1"
         provider: "cz.senslog.connector.push.rest.senslog.v1.SenslogV1ConnectorPushProvider"
         host:
-            domain: "http://localhost:8080"
-            path: "DBService-1.4-SNAPSHOT/FeederServlet"
+            domain: "http://foodie.lesprojekt.cz:8080"
+            path: "MapLogOT/FeederServlet"
 
 connectors:
     - AzureSenslogV1:

+ 6 - 2
connector-push-rest-senslog-v1/src/main/java/cz/senslog/connector/push/rest/senslog/v1/SenslogV1Pusher.java

@@ -82,9 +82,12 @@ class  SenslogV1Pusher implements ConnectorPusher<SenslogV1Model> {
         observationQueue.addAll(failedObservations);
         failedObservations.clear();
 
-        for (int counter = 1; counter < observationQueue.size() + 1; counter++) {
+        int counter = 0;
+        while (!observationQueue.isEmpty()) {
             Observation observation = observationQueue.remove();
+
             String id = UUID.randomUUID().toString();
+            counter += 1;
 
             logger.debug("Creating a request for the observation {}.", id);
             logger.info("Observation {} {}", id, observation);
@@ -110,7 +113,8 @@ class  SenslogV1Pusher implements ConnectorPusher<SenslogV1Model> {
             if (response.isError()) {
                 logger.error("Observation {} was not send. Reason {}.", id, response.getBody());
 
-                if (counter <= ALLOWED_REQUEST_FAILS) {
+
+                if (counter < ALLOWED_REQUEST_FAILS) {
                     failedObservations.add(observation);
                     continue;
                 } else {