[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/modules CrontabModule.java

[Michiel Meeuwissen]

Update of 
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules
In directory 
james.mmbase.org:/tmp/cvs-serv16867/src/org/mmbase/applications/crontab/modules

Modified Files:
        CrontabModule.java 
Log Message:
more MMB-1687


See also: 
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/modules
See also: http://www.mmbase.org/jira/browse/MMB-1687


Index: CrontabModule.java
===================================================================
RCS file: 
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/modules/CrontabModule.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- CrontabModule.java  29 Jul 2008 10:01:21 -0000      1.14
+++ CrontabModule.java  29 Jul 2008 15:21:45 -0000      1.15
@@ -10,6 +10,7 @@
 import java.util.*;
 import java.util.regex.*;
 import org.mmbase.util.xml.UtilReader;
+import org.mmbase.util.DynamicDate;
 import org.mmbase.util.functions.*;
 import org.mmbase.applications.crontab.*;
 import org.mmbase.module.WatchedReloadableModule;
@@ -19,7 +20,7 @@
  * Starts a crontab for MMBase as a Module.
  *
  * @author Michiel Meeuwissen
- * @version $Id: CrontabModule.java,v 1.14 2008/07/29 10:01:21 michiel Exp $
+ * @version $Id: CrontabModule.java,v 1.15 2008/07/29 15:21:45 michiel Exp $
  */
 public class CrontabModule extends WatchedReloadableModule {
 
@@ -160,7 +161,7 @@
     protected Function<Boolean> kickFunction = new 
AbstractFunction<Boolean>("kick", ENTRY) {
             public Boolean getFunctionValue(Parameters arguments) {
                 String id = arguments.get(ENTRY);
-                return cronDaemon.getCronEntry(id).kick();
+                return 
cronDaemon.getCronEntry(id).kick(DynamicDate.eval("tominute"));
             }
 
         };
@@ -238,6 +239,14 @@
         };
     {
         addFunction(reloadFunction);
+
+
+        addFunction(new AbstractFunction<List<ProposedJobs.Event>>("queue") {
+                public List<ProposedJobs.Event> getFunctionValue(Parameters 
arguments) {
+                    return cronDaemon.getQueue();
+                }
+
+            });
     }
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs