[sling-whiteboard] branch master updated: SLING-10067 - Added history view

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 6aa280a  SLING-10067 - Added history view
6aa280a is described below

commit 6aa280aa890c5a63cd3790b29ad7144a85e92bf4
Author: Christian Schneider <cschn...@adobe.com>
AuthorDate: Thu Jan 21 16:17:30 2021 +0100

    SLING-10067 - Added history view
---
 .../sling/distribution/chunked/ChunkedDistributionServlet.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/chunked-distribution/src/main/java/org/apache/sling/distribution/chunked/ChunkedDistributionServlet.java
 
b/chunked-distribution/src/main/java/org/apache/sling/distribution/chunked/ChunkedDistributionServlet.java
index 1d7fcd1..b5e6918 100644
--- 
a/chunked-distribution/src/main/java/org/apache/sling/distribution/chunked/ChunkedDistributionServlet.java
+++ 
b/chunked-distribution/src/main/java/org/apache/sling/distribution/chunked/ChunkedDistributionServlet.java
@@ -63,15 +63,20 @@ public class ChunkedDistributionServlet extends 
SlingAllMethodsServlet {
     @Override
     protected void doGet(SlingHttpServletRequest request, 
SlingHttpServletResponse response)
             throws ServletException, IOException {
+        String history = request.getParameter("history");
         TimeZone tz = TimeZone.getTimeZone("UTC");
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); // 
Quoted "Z" to indicate UTC, no timezone offset
         df.setTimeZone(tz);
         PrintWriter wr = response.getWriter();
-        Collection<Job> jobs = jobMananger.findJobs(QueryType.ACTIVE, 
ChunkedDistribution.TOPIC, -1, (Map<String, Object>[]) null);
+        Collection<Job> jobs = jobMananger.findJobs(history != null ? 
QueryType.HISTORY : QueryType.ALL, ChunkedDistribution.TOPIC, 10, (Map<String, 
Object>[]) null);
         wr.println("Jobs");
+        printJobs(df, wr, jobs);
+    }
+
+    private void printJobs(DateFormat df, PrintWriter wr, Collection<Job> 
jobs) {
         for (Job job : jobs) {
             String startedAt = df.format(job.getProcessingStarted().getTime());
-            wr.println(String.format("id: %s, step: %d/%d, startedAt: %s", 
job.getId(), job.getFinishedProgressStep(),  job.getProgressStepCount(), 
startedAt));
+            wr.println(String.format("id: %s, status:%s, step: %d/%d, 
startedAt: %s", job.getId(), job.getJobState().toString(), 
job.getFinishedProgressStep(),  job.getProgressStepCount(), startedAt));
             String[] log = job.getProgressLog();
             if (log != null) {
                 for (String line : log) {