From ef8cfea50d6ca763a4af6eb75287325e91f5f5ca Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 14 Apr 2022 18:12:10 -0700 Subject: Change health check package --- .../java/org/traccar/api/HealthCheckService.java | 87 ---------------------- .../java/org/traccar/schedule/ScheduleManager.java | 3 +- .../java/org/traccar/schedule/TaskHealthCheck.java | 87 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 src/main/java/org/traccar/api/HealthCheckService.java create mode 100644 src/main/java/org/traccar/schedule/TaskHealthCheck.java (limited to 'src') diff --git a/src/main/java/org/traccar/api/HealthCheckService.java b/src/main/java/org/traccar/api/HealthCheckService.java deleted file mode 100644 index 8a17c8798..000000000 --- a/src/main/java/org/traccar/api/HealthCheckService.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2020 - 2022 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 org.traccar.config.Keys; - -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -public class HealthCheckService implements Runnable { - - private static final Logger LOGGER = LoggerFactory.getLogger(HealthCheckService.class); - - private SystemD systemD; - - private boolean enabled; - private long period; - - public HealthCheckService() { - if (!Context.getConfig().getBoolean(Keys.WEB_DISABLE_HEALTH_CHECK) - && 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); - } - } - } - - private String getUrl() { - String address = Context.getConfig().getString(Keys.WEB_ADDRESS, "localhost"); - int port = Context.getConfig().getInteger(Keys.WEB_PORT); - return "http://" + address + ":" + port + "/api/server"; - } - - public void schedule(ScheduledExecutorService executor) { - if (enabled) { - executor.scheduleAtFixedRate(this, period, period, TimeUnit.MILLISECONDS); - } - } - - @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/schedule/ScheduleManager.java b/src/main/java/org/traccar/schedule/ScheduleManager.java index a1679717f..7a3d33b85 100644 --- a/src/main/java/org/traccar/schedule/ScheduleManager.java +++ b/src/main/java/org/traccar/schedule/ScheduleManager.java @@ -16,7 +16,6 @@ package org.traccar.schedule; import org.traccar.LifecycleObject; -import org.traccar.api.HealthCheckService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -31,7 +30,7 @@ public class ScheduleManager implements LifecycleObject { new TaskDeviceInactivityCheck().schedule(executor); new TaskWebSocketKeepalive().schedule(executor); - new HealthCheckService().schedule(executor); + new TaskHealthCheck().schedule(executor); } @Override diff --git a/src/main/java/org/traccar/schedule/TaskHealthCheck.java b/src/main/java/org/traccar/schedule/TaskHealthCheck.java new file mode 100644 index 000000000..087cd3e63 --- /dev/null +++ b/src/main/java/org/traccar/schedule/TaskHealthCheck.java @@ -0,0 +1,87 @@ +/* + * Copyright 2020 - 2022 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.schedule; + +import com.sun.jna.Library; +import com.sun.jna.Native; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.traccar.Context; +import org.traccar.config.Keys; + +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +public class TaskHealthCheck implements Runnable { + + private static final Logger LOGGER = LoggerFactory.getLogger(TaskHealthCheck.class); + + private SystemD systemD; + + private boolean enabled; + private long period; + + public TaskHealthCheck() { + if (!Context.getConfig().getBoolean(Keys.WEB_DISABLE_HEALTH_CHECK) + && 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); + } + } + } + + private String getUrl() { + String address = Context.getConfig().getString(Keys.WEB_ADDRESS, "localhost"); + int port = Context.getConfig().getInteger(Keys.WEB_PORT); + return "http://" + address + ":" + port + "/api/server"; + } + + public void schedule(ScheduledExecutorService executor) { + if (enabled) { + executor.scheduleAtFixedRate(this, period, period, TimeUnit.MILLISECONDS); + } + } + + @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); + } + +} -- cgit v1.2.3