Update of /var/cvs/applications/crontab/blocks
In directory james.mmbase.org:/tmp/cvs-serv10692/blocks

Modified Files:
        index.jspx 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/applications/crontab/blocks


Index: index.jspx
===================================================================
RCS file: /var/cvs/applications/crontab/blocks/index.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.jspx  29 Jul 2008 17:58:34 -0000      1.4
+++ index.jspx  29 Jul 2008 20:47:20 -0000      1.5
@@ -22,8 +22,9 @@
     <mm:import externid="interrupt" />
     <mm:present referid="interrupt">
       <mm:import externid="threadno" />
-      <mm:booleanfunction module="crontab" name="interrupt" referids="[EMAIL 
PROTECTED],[EMAIL PROTECTED]">
-        Interrupted cron job ${interrupt}.${thread}
+      <mm:import externid="machine" />
+      <mm:booleanfunction module="crontab" name="interrupt" referids="[EMAIL 
PROTECTED],[EMAIL PROTECTED],machine">
+        Interrupted cron job ${interrupt}.${thread} at ${machine}
       </mm:booleanfunction>
     </mm:present>
 
@@ -59,7 +60,7 @@
         <th>id</th>
         <th>type</th>
         <th>time</th>
-        <th>running</th>
+        <th>run</th>
         <th>last run started on</th>
         <th>cost of last run (ms)</th>
         <th># runs</th>
@@ -72,8 +73,8 @@
           <td>${cronentry.type}</td>
           <td>${cronentry.cronTime}</td>
           <td>
+            <jsp:text>${cronentry.servers}</jsp:text>
             <c:if test="${not cronentry.mustBeOne or not cronentry.alive}">
-              No
               <mm:link>
                 <mm:param name="kick" value="${cronentry.id}" />
                 <a href="${_}">Kick</a>
@@ -132,15 +133,17 @@
         <th>Running</th>
         <td>
           <mm:listfunction module="crontab" name="running" id="job">
-            Since <mm:time referid="job.start" format="$format" />
+            ${job} since
+            <mm:time referid="job.start" format="$format" />
             <mm:link>
               <mm:param name="interrupt" value="${job.cronEntry.id}" />
               <mm:param name="threadno">${job.id}</mm:param>
               <mm:param name="machine">${job.machine}</mm:param>
+              <jsp:text> </jsp:text>
               <a href="${_}">Interrupt</a>
             </mm:link>
-          </mm:listfunction>
           <br />
+          </mm:listfunction>
         </td>
       </tr>
       <tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to