0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update lasta-job

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-01-23 00:09:55 +09:00
parent 939f3c991a
commit ff9062e837
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -43,7 +43,7 @@
<dbflute.version>1.1.1</dbflute.version>
<lastaflute.version>0.8.1</lastaflute.version>
<lasta.taglib.version>0.6.8</lasta.taglib.version>
<lasta.job.version>0.2.1</lasta.job.version>
<lasta.job.version>0.2.2-RC1</lasta.job.version>
<servlet.version>3.1.0</servlet.version>
<jsp.version>2.3.1</jsp.version>
<mailflute.version>0.4.8</mailflute.version>

15
src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
View file

@ -39,7 +39,7 @@ import org.lastaflute.job.JobManager;
import org.lastaflute.job.LaCron;
import org.lastaflute.job.LaScheduledJob;
import org.lastaflute.job.key.LaJobUnique;
import org.lastaflute.job.subsidiary.CronOpCall;
import org.lastaflute.job.subsidiary.CronParamsSupplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -143,17 +143,17 @@ public class ScheduledJobService implements Serializable {
return;
}
final CronOpCall opLambda = option -> option.uniqueBy(id).changeNoticeLogToDebug().params(() -> {
final CronParamsSupplier paramsOp = () -> {
Map<String, Object> params = new HashMap<>();
params.put(Constants.SCHEDULED_JOB, scheduledJob);
return params;
});
};
findJobByUniqueOf(LaJobUnique.of(id)).ifPresent(job -> {
if (!job.isUnscheduled()) {
if (StringUtil.isNotBlank(scheduledJob.getCronExpression())) {
logger.info("Starting Job " + id + ":" + scheduledJob.getName());
final String cronExpression = scheduledJob.getCronExpression();
job.reschedule(cronExpression, opLambda);
job.reschedule(cronExpression, op -> op.changeNoticeLogToDebug().params(paramsOp));
} else {
logger.info("Inactive Job " + id + ":" + scheduledJob.getName());
job.becomeNonCron();
@ -161,7 +161,7 @@ public class ScheduledJobService implements Serializable {
} else if (StringUtil.isNotBlank(scheduledJob.getCronExpression())) {
logger.info("Starting Job " + id + ":" + scheduledJob.getName());
String cronExpression = scheduledJob.getCronExpression();
job.reschedule(cronExpression, opLambda);
job.reschedule(cronExpression, op -> op.changeNoticeLogToDebug().params(paramsOp));
}
}).orElse(
() -> {
@ -169,11 +169,12 @@ public class ScheduledJobService implements Serializable {
logger.info("Starting Job " + id + ":" + scheduledJob.getName());
final String cronExpression = scheduledJob.getCronExpression();
cron.register(cronExpression, fessConfig.getSchedulerJobClassAsClass(),
fessConfig.getSchedulerConcurrentExecModeAsEnum(), opLambda);
fessConfig.getSchedulerConcurrentExecModeAsEnum(),
op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
} else {
logger.info("Inactive Job " + id + ":" + scheduledJob.getName());
cron.registerNonCron(fessConfig.getSchedulerJobClassAsClass(), fessConfig.getSchedulerConcurrentExecModeAsEnum(),
opLambda);
op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
}
});
}