Merge remote-tracking branch 'origin/master'

3 files changed, 100 insertions, 4 deletions

diff --git a/src/main/java/org/traccar/api/ExtendedObjectResource.java b/src/main/java/org/traccar/api/ExtendedObjectResource.java
index 007a7b1bd..9e554217e 100644
--- a/src/main/java/org/traccar/api/ExtendedObjectResource.java
+++ b/src/main/java/org/traccar/api/ExtendedObjectResource.java
@@ -55,8 +55,8 @@ public class ExtendedObjectResource<T extends BaseModel> extends BaseObjectResou
             Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
             result.retainAll(manager.getDeviceItems(deviceId));
         }
-        return manager.getItems(result);
 
+        return manager.getItems(result);
     }
 
 }
diff --git a/src/main/java/org/traccar/api/HealthCheckService.java b/src/main/java/org/traccar/api/HealthCheckService.java
new file mode 100644
index 000000000..1e8f0d731
--- /dev/null
+++ b/src/main/java/org/traccar/api/HealthCheckService.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2020 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.api;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.traccar.Context;
+
+import java.util.TimerTask;
+
+public class HealthCheckService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HealthCheckService.class);
+
+    private SystemD systemD;
+
+    private boolean enabled;
+    private long period;
+
+    public HealthCheckService() {
+        if (Context.getConfig().getBoolean("web.healthCheck")
+                && System.getProperty("os.name").toLowerCase().startsWith("linux")) {
+            try {
+                systemD = Native.load("systemd", SystemD.class);
+                String watchdogTimer = System.getenv("WATCHDOG_USEC");
+                if (watchdogTimer != null && !watchdogTimer.isEmpty()) {
+                    period = Long.parseLong(watchdogTimer) / 1000 * 4 / 5;
+                }
+                if (period > 0) {
+                    LOGGER.info("Health check enabled with period {}", period);
+                    enabled = true;
+                }
+            } catch (UnsatisfiedLinkError e) {
+                LOGGER.warn("No systemd support", e);
+            }
+        }
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public long getPeriod() {
+        return period;
+    }
+
+    private String getUrl() {
+        String address = Context.getConfig().getString("web.address", "localhost");
+        int port = Context.getConfig().getInteger("web.port", 8082);
+        return "http://" + address + ":" + port + "/api/server";
+    }
+
+    public TimerTask createTask() {
+        return new TimerTask() {
+            @Override
+            public void run() {
+                LOGGER.debug("Health check running");
+                int status = Context.getClient().target(getUrl()).request().get().getStatus();
+                if (status == 200) {
+                    int result = systemD.sd_notify(0, "WATCHDOG=1");
+                    if (result < 0) {
+                        LOGGER.warn("Health check notify error {}", result);
+                    }
+                } else {
+                    LOGGER.warn("Health check failed with status {}", status);
+                }
+            }
+        };
+    }
+
+    interface SystemD extends Library {
+        @SuppressWarnings("checkstyle:MethodName")
+        int sd_notify(@SuppressWarnings("checkstyle:ParameterName") int unset_environment, String state);
+    }
+
+}
diff --git a/src/main/java/org/traccar/api/resource/PositionResource.java b/src/main/java/org/traccar/api/resource/PositionResource.java
index c031b842f..67aa6dd32 100644
--- a/src/main/java/org/traccar/api/resource/PositionResource.java
+++ b/src/main/java/org/traccar/api/resource/PositionResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 @Path("positions")
@@ -63,8 +64,12 @@ public class PositionResource extends BaseResource {
             return Context.getDeviceManager().getInitialState(getUserId());
         } else {
             Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            return Context.getDataManager().getPositions(
-                    deviceId, DateUtil.parseDate(from), DateUtil.parseDate(to));
+            if (from != null && to != null) {
+                return Context.getDataManager().getPositions(
+                        deviceId, DateUtil.parseDate(from), DateUtil.parseDate(to));
+            } else {
+                return Collections.singleton(Context.getDeviceManager().getLastPosition(deviceId));
+            }
         }
     }