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

Renamed some variables in the cron job section of the run() method.

Browse source 
Rewrote cron job cleanup code at the end of run().
This commit is contained in:
hns 2005-07-20 13:55:40 +00:00
parent 06fa3713a7
commit 4539f0f74a
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1486,30 +1486,30 @@ public final class Application implements IPathElement, Runnable {
lastCronParse = props.lastModified(); lastCronParse = props.lastModified();
} }
Date d = new Date(); Date date = new Date();
List jobs = new ArrayList(cronJobs); List jobs = new ArrayList(cronJobs);
jobs.addAll(customCronJobs.values()); jobs.addAll(customCronJobs.values());
CronJob.sort(jobs); CronJob.sort(jobs);
for (Iterator i = jobs.iterator(); i.hasNext();) { for (Iterator i = jobs.iterator(); i.hasNext();) {
CronJob j = (CronJob) i.next(); CronJob job = (CronJob) i.next();
if (j.appliesToDate(d)) { if (job.appliesToDate(date)) {
// check if the job is already active ... // check if the job is already active ...
if (activeCronJobs.containsKey(j.getName())) { if (activeCronJobs.containsKey(job.getName())) {
logEvent(j + " is still active, skipped in this minute"); logEvent(job + " is still active, skipped in this minute");
continue; continue;
} }
RequestEvaluator thisEvaluator; RequestEvaluator evaluator;
try { try {
thisEvaluator = getEvaluator(); evaluator = getEvaluator();
} catch (RuntimeException rt) { } catch (RuntimeException rt) {
if (running) { if (running) {
logEvent("couldn't execute " + j + logEvent("couldn't execute " + job +
", maximum thread count reached"); ", maximum thread count reached");
continue; continue;
@ -1520,20 +1520,20 @@ public final class Application implements IPathElement, Runnable {
// if the job has a long timeout or we're already late during this minute // if the job has a long timeout or we're already late during this minute
// the job is run from an extra thread // the job is run from an extra thread
if ((j.getTimeout() > 20000) || if ((job.getTimeout() > 20000) ||
(CronJob.millisToNextFullMinute() < 30000)) { (CronJob.millisToNextFullMinute() < 30000)) {
CronRunner r = new CronRunner(thisEvaluator, j); CronRunner r = new CronRunner(evaluator, job);
activeCronJobs.put(j.getName(), r); activeCronJobs.put(job.getName(), r);
r.start(); r.start();
} else { } else {
try { try {
thisEvaluator.invokeInternal(null, j.getFunction(), evaluator.invokeInternal(null, job.getFunction(),
new Object[0], j.getTimeout()); new Object[0], job.getTimeout());
} catch (Exception ex) { } catch (Exception ex) {
logEvent("error running " + j + ": " + ex.toString()); logEvent("error running " + job + ": " + ex.toString());
} finally { } finally {
releaseEvaluator(thisEvaluator); releaseEvaluator(evaluator);
} }
} }
} }
@ -1546,7 +1546,9 @@ public final class Application implements IPathElement, Runnable {
if (sleepProp != null) { if (sleepProp != null) {
sleepInterval = Math.max(1000, Integer.parseInt(sleepProp)*1000); sleepInterval = Math.max(1000, Integer.parseInt(sleepProp)*1000);
} }
} catch (Exception ignore) {} } catch (Exception ignore) {
// we'll use the default interval
}
// sleep until the next full minute // sleep until the next full minute
try { try {
@ -1559,11 +1561,9 @@ public final class Application implements IPathElement, Runnable {
// when interrupted, shutdown running cron jobs // when interrupted, shutdown running cron jobs
synchronized (activeCronJobs) { synchronized (activeCronJobs) {
for (Iterator i = activeCronJobs.keySet().iterator(); i.hasNext();) { for (Iterator i = activeCronJobs.values().iterator(); i.hasNext();) {
String jobname = (String) i.next(); ((CronRunner) i.next()).interrupt();
i.remove();
((CronRunner) activeCronJobs.get(jobname)).interrupt();
activeCronJobs.remove(jobname);
} }
} }