Update of
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules
In directory james.mmbase.org:/tmp/cvs-serv917/modules
Modified Files:
CrontabModule.java
Log Message:
on reload of the module, also reload the jobs defined by the cronjobs builder
See also:
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/modules
Index: CrontabModule.java
===================================================================
RCS file:
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules/CrontabModule.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- CrontabModule.java 4 Aug 2008 14:12:38 -0000 1.19
+++ CrontabModule.java 9 Dec 2008 13:38:49 -0000 1.20
@@ -13,6 +13,7 @@
import org.mmbase.util.DynamicDate;
import org.mmbase.util.functions.*;
import org.mmbase.applications.crontab.*;
+import org.mmbase.applications.crontab.builders.CronJobs;
import org.mmbase.module.WatchedReloadableModule;
import org.mmbase.util.logging.*;
@@ -20,7 +21,7 @@
* Starts a crontab for MMBase as a Module.
*
* @author Michiel Meeuwissen
- * @version $Id: CrontabModule.java,v 1.19 2008/08/04 14:12:38 michiel Exp $
+ * @version $Id: CrontabModule.java,v 1.20 2008/12/09 13:38:49 michiel Exp $
*/
public class CrontabModule extends WatchedReloadableModule {
@@ -50,7 +51,7 @@
}
private static final Logger log =
Logging.getLoggerInstance(CrontabModule.class);
- protected CronDaemon cronDaemon = null;
+ protected final CronDaemon cronDaemon;
/**
* Need to remember which crontab entries where 'mine', to known which
must be removed if
@@ -144,11 +145,14 @@
*/
public void reload() {
log.info("Reloading crontab");
- Iterator<CronEntry> i = myEntries.iterator();
- while (i.hasNext()) {
- cronDaemon.remove(i.next());
+ for (CronEntry e : myEntries) {
+ cronDaemon.remove(e);
}
myEntries.clear();
+ CronJobs cronJobs = CronJobs.getBuilder();
+ if (cronJobs != null) {
+ cronJobs.readJobs();
+ }
init();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
