antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

added try-catch-blocks around CronJob parsing and CronJob handling

Browse source
This commit is contained in:
kmfdm 2005-08-09 12:55:23 +00:00
parent 5982de3b48
commit 9b97203b3a
1 changed files with 64 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

119
src/helma/framework/core/Application.java
View file

@ -1480,71 +1480,80 @@ public final class Application implements IPathElement, Runnable {
}
}
if ((cronJobs == null) || (props.lastModified() > lastCronParse)) {
updateProperties();
cronJobs = CronJob.parse(props);
lastCronParse = props.lastModified();
try {
if ((cronJobs == null) || (props.lastModified() > lastCronParse)) {
updateProperties();
cronJobs = CronJob.parse(props);
lastCronParse = props.lastModified();
}
} catch (Exception ex) {
logEvent ("error parsing CronJobs: " + ex);
ex.printStackTrace();
}
Date date = new Date();
List jobs = new ArrayList(cronJobs);
jobs.addAll(customCronJobs.values());
CronJob.sort(jobs);
logEvent("Running cron jobs: " + jobs);
if (!activeCronJobs.isEmpty()) {
logEvent("Cron jobs still running from last minute: " + activeCronJobs);
}
for (Iterator i = jobs.iterator(); i.hasNext();) {
CronJob job = (CronJob) i.next();
if (job.appliesToDate(date)) {
// check if the job is already active ...
if (activeCronJobs.containsKey(job.getName())) {
logEvent(job + " is still active, skipped in this minute");
continue;
}
RequestEvaluator evaluator;
try {
evaluator = getEvaluator();
} catch (RuntimeException rt) {
if (running) {
logEvent("couldn't execute " + job +
", maximum thread count reached");
try {
Date date = new Date();
List jobs = new ArrayList(cronJobs);
jobs.addAll(customCronJobs.values());
CronJob.sort(jobs);
logEvent("Running cron jobs: " + jobs);
if (!activeCronJobs.isEmpty()) {
logEvent("Cron jobs still running from last minute: " + activeCronJobs);
}
for (Iterator i = jobs.iterator(); i.hasNext();) {
CronJob job = (CronJob) i.next();
if (job.appliesToDate(date)) {
// check if the job is already active ...
if (activeCronJobs.containsKey(job.getName())) {
logEvent(job + " is still active, skipped in this minute");
continue;
} else {
break;
}
}
// if the job has a long timeout or we're already late during this minute
// the job is run from an extra thread
if ((job.getTimeout() > 20000) ||
(CronJob.millisToNextFullMinute() < 30000)) {
CronRunner runner = new CronRunner(evaluator, job);
activeCronJobs.put(job.getName(), runner);
runner.start();
} else {
RequestEvaluator evaluator;
try {
evaluator.invokeInternal(null, job.getFunction(),
new Object[0], job.getTimeout());
} catch (Exception ex) {
logEvent("error running " + job + ": " + ex);
} finally {
releaseEvaluator(evaluator);
evaluator = getEvaluator();
} catch (RuntimeException rt) {
if (running) {
logEvent("couldn't execute " + job +
", maximum thread count reached");
continue;
} else {
break;
}
}
// if the job has a long timeout or we're already late during this minute
// the job is run from an extra thread
if ((job.getTimeout() > 20000) ||
(CronJob.millisToNextFullMinute() < 30000)) {
CronRunner runner = new CronRunner(evaluator, job);
activeCronJobs.put(job.getName(), runner);
runner.start();
} else {
try {
evaluator.invokeInternal(null, job.getFunction(),
new Object[0], job.getTimeout());
} catch (Exception ex) {
logEvent("error running " + job + ": " + ex);
} finally {
releaseEvaluator(evaluator);
}
}
}
}
} catch (Exception ex) {
logEvent("error handling CronJobs: " + ex);
ex.printStackTrace();
}
long sleepInterval = CronJob.millisToNextFullMinute();
try {
String sleepProp = props.getProperty("schedulerInterval");