Changeset 6581 for branches/3.3-stable/www/views/jobs/index.jsp

Timestamp:

Oct 29, 2014, 10:49:23 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1875: Abort multiple jobs

File:

• branches/3.3-stable/www/views/jobs/index.jsp (modified) (2 diffs)

branches/3.3-stable/www/views/jobs/index.jsp

@@ -58 +58 @@
   import="java.util.List"
   import="java.util.ArrayList"
+  import="java.util.Collection"
   import="java.util.Collections"
 %>
@@ -278 +279 @@
     redirect = viewPage;
   }
+  else if ("AbortJobs".equals(cmd))
+  {
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    dc = sc.newDbControl();
+    int numAborted = 0;
+    int numSelected = 0;
+    for (int jobId : cc.getSelected())
+    {
+      numSelected++;
+      Job job = Job.getById(dc, jobId);
+      SignalTransporter signalTransporter = job.getSignalTransporter();
+      if (signalTransporter == null)
+      {
+        if (job.getStatus() == Job.Status.WAITING)
+        {
+          job.doneError("Aborted by user");
+          numAborted++;
+        }
+      }
+      else
+      {
+        Collection<Signal> supportedSignals = signalTransporter.getSupportedSignals();
+        if (supportedSignals == null || supportedSignals.contains(Signal.ABORT))
+        {
+          signalTransporter.send(Signal.ABORT);
+          numAborted++;
+        }
+      }
+    }
+    dc.commit();
+    
+    message = numAborted + " of " + numSelected + " jobs have been aborted ";
+    Thread.sleep(500);
+    redirect = listPage;
+  }
   else if ("AbortJob".equals(cmd))
   {