From 8d6e45331cb4ba86faaabfe7d1f9e7ccfd6e824d Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 22 Feb 2020 16:59:43 -0800
Subject: Support health monitoring

---
 src/main/java/org/traccar/Main.java | 59 ++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 23 deletions(-)

(limited to 'src/main/java/org/traccar/Main.java')

diff --git a/src/main/java/org/traccar/Main.java b/src/main/java/org/traccar/Main.java
index 6ebd1d399..f5690b26d 100644
--- a/src/main/java/org/traccar/Main.java
+++ b/src/main/java/org/traccar/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 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.
@@ -19,6 +19,7 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.traccar.api.HealthCheckService;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
@@ -105,6 +106,27 @@ public final class Main {
         }
     }
 
+    private static void scheduleHealthCheck() {
+        HealthCheckService service = new HealthCheckService();
+        if (service.isEnabled()) {
+            new Timer().scheduleAtFixedRate(
+                    service.createTask(), service.getPeriod(), service.getPeriod());
+        }
+    }
+
+    private static void scheduleDatabaseCleanup() {
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    Context.getDataManager().clearHistory();
+                } catch (SQLException error) {
+                    LOGGER.warn("Clear history error", error);
+                }
+            }
+        }, 0, CLEAN_PERIOD);
+    }
+
     public static void run(String configFile) {
         try {
             Context.init(configFile);
@@ -118,35 +140,26 @@ public final class Main {
                 Context.getWebServer().start();
             }
 
-            new Timer().scheduleAtFixedRate(new TimerTask() {
+            new Timer().schedule(new TimerTask() {
                 @Override
                 public void run() {
-                    try {
-                        Context.getDataManager().clearHistory();
-                    } catch (SQLException error) {
-                        LOGGER.warn("Clear history error", error);
-                    }
+                    Context.getWebServer().stop();
                 }
-            }, 0, CLEAN_PERIOD);
+            }, 10 * 60 * 1000);
 
-            Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-                @Override
-                public void uncaughtException(Thread t, Throwable e) {
-                    LOGGER.error("Thread exception", e);
-                }
-            });
+            scheduleHealthCheck();
+            scheduleDatabaseCleanup();
 
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override
-                public void run() {
-                    LOGGER.info("Shutting down server...");
+            Thread.setDefaultUncaughtExceptionHandler((t, e) -> LOGGER.error("Thread exception", e));
+
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                LOGGER.info("Shutting down server...");
 
-                    if (Context.getWebServer() != null) {
-                        Context.getWebServer().stop();
-                    }
-                    Context.getServerManager().stop();
+                if (Context.getWebServer() != null) {
+                    Context.getWebServer().stop();
                 }
-            });
+                Context.getServerManager().stop();
+            }));
         } catch (Exception e) {
             LOGGER.error("Main method error", e);
             throw new RuntimeException(e);
-- 
cgit v1.2.3


From 7db2926c38edafb4cbd9b2cda1a98b5567836bc1 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 23 Feb 2020 17:34:08 -0800
Subject: Remove debugging code

---
 src/main/java/org/traccar/Main.java | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/main/java/org/traccar/Main.java')

diff --git a/src/main/java/org/traccar/Main.java b/src/main/java/org/traccar/Main.java
index f5690b26d..47d6e91df 100644
--- a/src/main/java/org/traccar/Main.java
+++ b/src/main/java/org/traccar/Main.java
@@ -140,13 +140,6 @@ public final class Main {
                 Context.getWebServer().start();
             }
 
-            new Timer().schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    Context.getWebServer().stop();
-                }
-            }, 10 * 60 * 1000);
-
             scheduleHealthCheck();
             scheduleDatabaseCleanup();
 
-- 
cgit v1.2.3