X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fserver.lisp;h=f086aa24242e4d55f6036c2e8cd08d9b2c94001b;hb=09ef79e902dcf475d6cd9dc34bc74a46b39150c3;hp=f95976e3b1a3a066b51381cdfdc7bc3ef5e214ff;hpb=124e400cd0be0e884d0cb7ea400899b3288c1fc0;p=candle

diff --git a/src/main/server.lisp b/src/main/server.lisp
index f95976e..f086aa2 100644
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -2,32 +2,58 @@
 
 (defun server (port &optional (background t))
  (when (not *candle-dir*) (error "Need a candle dir"))
- (let
+ (let*
   ((data-dir (format nil "~Adata" *candle-dir*)))
   (ensure-directories-exist *candle-dir*)
   (ensure-directories-exist data-dir)
   (lame-db:load-known-dbs data-dir)
-  (sb-thread:make-thread
-   (lambda ()
-    (do () (nil)
-     (progn
-      (sleep (* 5 60))
-      (lame-db:save-known-dbs data-dir))))
-   :name "Save Thread")
   (format t "Starting processor in ~(~A~) mode~%" *job-system*)
+  (start-save-thread data-dir)
   (start-processor-thread)
   (communication:start-listener port background)))
 
+(defun start-save-thread (data-dir)
+ (format t "Starting Save Thread~%")
+ (let*
+  ((mutex (sb-thread:make-mutex))
+   (waitq (sb-thread:make-waitqueue))
+   (active t)
+   (save-thread
+    (sb-thread:make-thread
+     (lambda ()
+      (loop
+       :while active
+       :do
+       (sb-thread:with-mutex (mutex)
+        (sb-thread:condition-wait waitq mutex)))
+      (lame-db:save-known-dbs data-dir))
+     :name "Save Thread")))
+  (sb-thread:make-thread
+   (lambda ()
+    (loop
+     (sleep (* 1 60))
+     (sb-thread:with-mutex (mutex)
+      (sb-thread:condition-broadcast waitq))))
+   :name "Save Thread Trigger")
+  (push
+   (lambda ()
+    (format t "Shutting down save thread~%")
+    (sb-thread:with-mutex (mutex)
+     (setf active nil)
+     (sb-thread:condition-broadcast waitq))
+    (sb-thread:join-thread save-thread))
+   sb-ext:*exit-hooks*)))
+
 (defun add-project (name src)
  (when
   (not (cl-ppcre:scan "^[0-9A-Za-z-]*$" name))
-  (error "Name contains invalid characters"))
+  (raise-candle-error :invalid-project-name))
  (when
   (not (git nil "ls-remote" src))
-  (error "Project uri is not a valid git repository"))
+  (raise-candle-error :invalid-project-uri))
  (when
   (find name *all-project* :test #'string= :key #'project-name)
-  (error "Project name already taken"))
+  (raise-candle-error :project-name-taken))
  (let
   ((project (make-project :name name :src src)))
   (ensure-directories-exist (project-dir project))
@@ -42,7 +68,7 @@
   (git project "fetch" "origin" "--prune")
   (multiple-value-bind (success code out err) (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*")
    (declare (ignore code err))
-   (when (not success) (error "Failed to get branches"))
+   (when (not success) (raise-candle-error :project-failed-to-get-branches))
    (mapcar (lambda (branch) (set-branch-in-git branch nil)) branches)
    (mapcar
     (lambda (line)
@@ -64,7 +90,7 @@
 (defun delete-project (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (error "Project does not exist"))
+  (when (not project) (raise-candle-error :project-does-not-exist))
   (sb-ext:delete-directory (project-dir project) :recursive t)
   (mapcar #'nremove-job (find-job-by-project project))
   (mapcar #'nremove-branch (find-branch-by-project project))
@@ -76,7 +102,7 @@
 (defun project-branch-information (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (error "Project does not exist"))
+  (when (not project) (raise-candle-error :project-does-not-exist))
   (mapcar
    (lambda (branch)
     (list
@@ -86,11 +112,14 @@
 
 (defun project-job-information (name)
  (let
-  ((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))))
+  ((project (when name (find name *all-project* :test #'string= :key #'project-name))))
+  (when (and name (not project)) (raise-candle-error :project-does-not-exist))
+  (mapcar #'job->job-information
+   (if project
+    (find-job-by-project project)
+    *all-job*))))
 
-(defun get-job-log (project-name sha)
+(defun find-job-by-project-and-sha (project-name sha)
  (let*
   ((project (find project-name *all-project* :test #'string= :key #'project-name))
    (job
@@ -100,9 +129,16 @@
        (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)))
+  (when (not project) (raise-candle-error :project-does-not-exist))
+  (when (not job) (raise-candle-error :job-does-not-exist))
+  job))
+
+(defun get-job-log (project-name sha)
+ (job-log (find-job-by-project-and-sha project-name sha)))
+
+(defun retry-job (project-name sha)
+ (set-job-status (find-job-by-project-and-sha project-name sha) :queued)
+ (awaken-processor-thread))
 
 (defun list-projects ()
  (mapcar
@@ -113,10 +149,10 @@
   *all-project*))
 
 (defun failures (project-name)
- (length
-  (remove-if-not
-   (lambda (branch) (eql :failed (job-status (branch-job branch))))
-   (if project-name
-     (find-branch-by-project
-      (find project-name *all-project* :test #'string= :key #'project-name))
-     *all-branch*))))
+ (let
+  ((project (when project-name (find project-name *all-project* :test #'string= :key #'project-name))))
+  (when (and project-name (not project)) (raise-candle-error :project-does-not-exist))
+  (length
+   (remove-if-not
+    (lambda (branch) (eql :failed (job-status (branch-job branch))))
+    (if project (find-branch-by-project project) *all-branch*)))))