display the last runtime for each job on the main Jobs page

lucidsoftware · May 11, 2016 · e356b3c · e356b3c
1 parent a514738
commit e356b3c
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 5 deletions.
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/Jobs.scala b/admin/app/com/lucidchart/piezo/admin/controllers/Jobs.scala
@@ -35,7 +35,12 @@ class Jobs(schedulerFactory: WorkerSchedulerFactory) extends Controller {
   }
 
   def getIndex = Action { implicit request =>
-    Ok(com.lucidchart.piezo.admin.views.html.jobs(getJobsByGroup(), None, scheduler.getMetaData)(request))
+    val allJobs: List[JobKey] = getJobsByGroup().foldLeft(List[JobKey]())({(finalList, jobsForGroup) =>
+      finalList ::: jobsForGroup._2})
+    val jobHistories = allJobs.flatMap({ job =>
+      jobHistoryModel.getJob(job.getName, job.getGroup).headOption
+    })
+    Ok(com.lucidchart.piezo.admin.views.html.jobs(getJobsByGroup(), None, Some(jobHistories), scheduler.getMetaData)(request))
   }
 
   def getJob(group: String, name: String) = Action { implicit request =>

diff --git a/admin/app/com/lucidchart/piezo/admin/views/job.scala.html b/admin/app/com/lucidchart/piezo/admin/views/job.scala.html
@@ -185,8 +185,8 @@ <h4>Job History</h4>
             <table class="table table-bordered table-striped table-hover table-condensed">
                 <thead>
                 <tr>
-                    <th>Trigger Name</th>
                     <th>Trigger Group</th>
+                    <th>Trigger Name</th>
                     <th>Success</th>
                     <th>Start</th>
                     <th>Finish</th>
@@ -195,8 +195,8 @@ <h4>Job History</h4>
                 <tbody>
                 @jobHistory.get.map { record =>
                 <tr>
-                    <td>@record.trigger_name</td>
                     <td>@record.trigger_group</td>
+                    <td>@record.trigger_name</td>
                     <td>@record.success</td>
                     <td>@record.start</td>
                     <td>@record.finish</td>

diff --git a/admin/app/com/lucidchart/piezo/admin/views/jobs.scala.html b/admin/app/com/lucidchart/piezo/admin/views/jobs.scala.html
@@ -1,6 +1,7 @@
 @(
 jobsByGroup: scala.collection.mutable.Buffer[(String, scala.collection.immutable.List[org.quartz.JobKey])],
 currentJob: Option[org.quartz.JobDetail],
+jobsHistory: Option[List[com.lucidchart.piezo.JobRecord]],
 schedulerMetadata: org.quartz.SchedulerMetaData,
 errorMessage: Option[String] = None
 )(
@@ -25,4 +26,35 @@ <h3>Select a job</h3>
     </tr>
     </tbody>
 </table>
+
+
+    @if(jobsHistory.isDefined) {
+    <h4>Job History</h4>
+    <table class="table table-bordered table-striped table-hover table-condensed">
+        <thead>
+        <tr>
+            <th>Job Group</th>
+            <th>Job Name</th>
+            <th>Trigger Group</th>
+            <th>Trigger Name</th>
+            <th>Success</th>
+            <th>Start</th>
+            <th>Finish</th>
+        </tr>
+        </thead>
+        <tbody>
+        @jobsHistory.get.map { record =>
+        <tr>
+            <td>@record.group</td>
+            <td>@record.name</td>
+            <td>@record.trigger_group</td>
+            <td>@record.trigger_name</td>
+            <td>@record.success</td>
+            <td>@record.start</td>
+            <td>@record.finish</td>
+        </tr>
+        }
+        </tbody>
+    </table>
+    }
 }
diff --git a/admin/project/Build.scala b/admin/project/Build.scala
@@ -12,7 +12,7 @@ object ApplicationBuild extends Build {
     jdbc,
     anorm,
     "org.quartz-scheduler" % "quartz" % "2.1.7",
-    "com.lucidchart" %% "piezo-worker" % "1.11"
+    "com.lucidchart" %% "piezo-worker" % "1.12"
   )
 
   val main = Project(appName, file(".")).enablePlugins(play.PlayScala).settings(

diff --git a/worker/build.sbt b/worker/build.sbt
@@ -2,7 +2,7 @@ name := "piezo-worker"
 
 organization := "com.lucidchart"
 
-version := "1.11"
+version := "1.12"
 
 scalaVersion := "2.11.7"
 

diff --git a/worker/src/main/scala/com/lucidchart/piezo/JobHistoryModel.scala b/worker/src/main/scala/com/lucidchart/piezo/JobHistoryModel.scala
@@ -83,4 +83,32 @@ class JobHistoryModel(props: Properties) {
       connection.close()
     }
   }
+
+  def getJobs(): List[JobRecord] = {
+    val connection = connectionProvider.getConnection
+
+    try {
+      val prepared = connection.prepareStatement("""SELECT * FROM job_history ORDER BY start DESC LIMIT 100""")
+      val rs = prepared.executeQuery()
+
+      var result = List[JobRecord]()
+      while(rs.next()) {
+        result :+= new JobRecord(
+          rs.getString("job_name"),
+          rs.getString("job_group"),
+          rs.getString("trigger_name"),
+          rs.getString("trigger_group"),
+          rs.getInt("success"),
+          rs.getTimestamp("start"),
+          rs.getTimestamp("finish")
+        )
+      }
+      result
+    } catch {
+      case e: Exception => logger.error("error in retrieving jobs", e)
+        List()
+    } finally {
+      connection.close()
+    }
+  }
 }