Merge branch 'tm_merge_conflict' into feature/taskmanager

Author: C-Hess

src/main/java/com/github/bustedearlobes/themis/taskmanager/ScheduledTask.java

@@ -23,6 +23,7 @@ public abstract class ScheduledTask extends ListenerAdapter implements Runnable,
     private long repeat;
     private long numberOfRuns;
     private AtomicBoolean isComplete;
+    private AtomicBoolean isInProgress;
     private transient long timeOfNextRun;
     private transient JDA jda;
 
@@ -39,7 +40,7 @@ protected boolean taskIsReady() {
     }
 
     protected boolean isExpired() {
-        return (numberOfRuns > repeat);
+        return ((numberOfRuns > repeat) && isComplete());
     }
 
     protected JDA getJDA() {
@@ -93,6 +94,7 @@ protected User getUserById(String userId) {
 
     @Override
     public final void run() {
+        isInProgress.set(true);
         jda.addEventListener(this);
         try {
             runTask();
@@ -131,4 +133,8 @@ public long getTimeUntilNextRun() {
     }
 
     protected abstract void runTask();
+
+    public boolean isInProgress() {
+        return isInProgress.get();
+    }
 }

src/main/java/com/github/bustedearlobes/themis/taskmanager/TaskManager.java

@@ -60,7 +60,7 @@ public void run() {
             synchronized(scheduledTasks) {
                 for(int i = 0; i < scheduledTasks.size(); i++) {
                     task = scheduledTasks.get(i);
-                    if(task.taskIsReady()) {
+                    if(task.taskIsReady() && !task.isInProgress()) {
                         executor.execute(task);
                         task.incrementRun();
                     }
@@ -86,9 +86,9 @@ public void run() {
     public void shutdown() {
         isRunning.set(false);
         executor.shutdown();
-        LOG.info("Shutting down task manager. Awaiting 30 seconds max for safe task exit...");
+        LOG.info("Shutting down task manager. Awaiting 5 seconds max for safe task exit...");
         try {
-            if(!executor.awaitTermination(30, TimeUnit.SECONDS)) {
+            if(!executor.awaitTermination(5, TimeUnit.SECONDS)) {
                 LOG.warning("Could not shut down task manager safely. Timeout exceded");
                 executor.shutdownNow();
             }