Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Added JobMode to StrolchJob for Manual, Once and Recurring

This commit is contained in:
Robert von Burg 2018-09-10 17:51:35 +02:00
parent 79af081384
commit 00ade23b4d
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
li.strolch.agent/src/main/java/li/strolch/job/JobMode.java Normal file
View File

@ -0,0 +1,7 @@
package li.strolch.job;
public enum JobMode {
Manual,
Once,
Recurring
}

27
li.strolch.agent/src/main/java/li/strolch/job/StrolchJob.java
View File

@ -41,6 +41,7 @@ public abstract class StrolchJob implements Runnable {
private StrolchAgent agent;
private String realmName;
private final JobMode mode;
private long initialDelay;
private TimeUnit initialDelayTimeUnit;
private long delay;
@ -51,9 +52,10 @@ public abstract class StrolchJob implements Runnable {
private ScheduledFuture<?> future;
private Throwable lastException;
public StrolchJob(StrolchAgent agent, long initialDelay, TimeUnit initialDelayTimeUnit, long delay,
public StrolchJob(StrolchAgent agent, JobMode jobMode, long initialDelay, TimeUnit initialDelayTimeUnit, long delay,
TimeUnit delayTimeUnit) {
this.agent = agent;
this.mode = jobMode;
this.initialDelay = initialDelay;
this.initialDelayTimeUnit = initialDelayTimeUnit;
@ -63,6 +65,10 @@ public abstract class StrolchJob implements Runnable {
this.first = true;
}
public JobMode getMode() {
return this.mode;
}
public String getName() {
return getClass().getSimpleName();
}
@ -170,8 +176,19 @@ public abstract class StrolchJob implements Runnable {
}
this.nrOfExecutions++;
this.first = false;
schedule();
if (this.first) {
this.first = false;
if (this.mode == JobMode.Recurring) {
schedule();
} else {
logger.info("Not scheduling " + getName() + " after first execution as mode is " + this.mode);
}
} else {
schedule();
}
}
/**
@ -197,6 +214,10 @@ public abstract class StrolchJob implements Runnable {
* @return this instance for chaining
*/
public StrolchJob schedule() {
if (this.mode == JobMode.Manual) {
logger.info("Not scheduling " + getName() + " as mode is " + this.mode);
return this;
}
// first cancel a possibly already scheduled task
cancel(false);