Add job --log

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index bee2885a6dab94847183ecb04077aa9d60982a20..ee917b3c98e1acb9bb9f881a72b9770d5f1860b8 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -25,7 +25,10 @@
  '((:name :help :short "h" :long "help" :description "Print this usage.")
    (:name :project-name :long "project" :takes-argument t
     :variable-name "PROJECT"
-    :description "The project name for the jobs under consideration.  Required argumnet.")))
+    :description "The project name for the jobs under consideration.  Required argumnet.")
+   (:name :log :long "log" :takes-argument t
+    :variable-name "SHA"
+    :description "Show's the processing log for job at sha SHA.  SHA can be truncated.")))
 
 (defun run-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")))
@@ -90,6 +93,9 @@
    #'job-info->line
    (sort (communication:query `(candle:project-job-information ,name)) #'< :key #'third))))
 
+(defun job-log (project-name sha)
+ (format t "~A~%" (communication:query `(candle:get-job-log ,project-name ,sha))))
+
 (defun refresh-project (name)
  (communication:query `(candle:refresh-project ,name))
  (format t "Refreshed project ~A~%" name))
@@ -112,6 +118,7 @@
    ((eql error :required-argument-missing) (format *error-output* "Missing argument for ~A.  See 'candle job --help'.~%" (car remaining-args)))
    ((opera:option-present :help options) (format t "~A" (opera:usage "candle job" (job-options))))
    ((not (opera:option-present :project-name options)) (format *error-output* "Requires --project argument.  See 'candle job --help'.~%" ))
+   ((opera:option-present :log options) (job-log (opera:option-argument :project-name options) (opera:option-argument :log options)))
    (t (project-history (opera:option-argument :project-name options))))))
 
 (defmethod execute-command ((command (eql :run)) args)

diff --git a/src/main/package.lisp b/src/main/package.lisp
index 88e02c7c73a1e1dbb990c4a84c6537ae4f7fe3f3..0f75498b3c38341b8bd7145ca1c03d3b378e842d 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -2,6 +2,6 @@
  (:export
   #:server #:add-project #:delete-project #:refresh-project
   #:project-branch-information #:run #:*candle-dir* #:*job-system*
-  #:project-job-information))
+  #:project-job-information #:get-job-log))
 
 (defpackage #:candle-cli (:use :cl) (:export :run))

diff --git a/src/main/server.lisp b/src/main/server.lisp
index 409a804417cf3ee0c3521ae58e2a7ce81cb46ec2..1f9a96cc1d2fd2888995c1f998c6a627911cef28 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -89,3 +89,17 @@
   ((project (find name *all-project* :test #'string= :key #'project-name)))
   (when (not project) (error "Project does not exist"))
   (mapcar #'job->job-information (find-job-by-project project))))
+
+(defun get-job-log (project-name sha)
+ (let*
+  ((project (find project-name *all-project* :test #'string= :key #'project-name))
+   (job
+    (when project
+     (find-if
+      (lambda (job-sha)
+       (and (<= (length sha) (length job-sha)) (string= sha (subseq job-sha 0 (length sha)))))
+     (find-job-by-project project)
+     :key #'job-sha))))
+  (when (not project) (error "Project does not exist"))
+  (when (not job) (error "Job does not exist"))
+  (job-log job)))