Merge branch 'master' into develop

1 files changed, 19 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/schedule/ScheduleManager.java b/src/main/java/org/traccar/schedule/ScheduleManager.java
index 5d5054100..6412a186a 100644
--- a/src/main/java/org/traccar/schedule/ScheduleManager.java
+++ b/src/main/java/org/traccar/schedule/ScheduleManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 - 2021 Anton Tananaev (anton@traccar.org)
+ * 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.
@@ -15,29 +15,39 @@
  */
 package org.traccar.schedule;
 
+import com.google.inject.Injector;
+import org.traccar.LifecycleObject;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-public class ScheduleManager {
+@Singleton
+public class ScheduleManager implements LifecycleObject {
 
+    private final Injector injector;
     private ScheduledExecutorService executor;
 
-    public void start() {
+    @Inject
+    public ScheduleManager(Injector injector) {
+        this.injector = injector;
+    }
 
+    @Override
+    public void start() {
         executor = Executors.newSingleThreadScheduledExecutor();
-
-        new TaskDeviceInactivityCheck().schedule(executor);
-        new TaskWebSocketKeepalive().schedule(executor);
-
+        List.of(TaskDeviceInactivityCheck.class, TaskWebSocketKeepalive.class, TaskHealthCheck.class)
+                .forEach(task -> injector.getInstance(task).schedule(executor));
     }
 
+    @Override
     public void stop() {
-
         if (executor != null) {
             executor.shutdown();
             executor = null;
         }
-
     }
 
 }