Use utils logging

[candle] / src / main / server.lisp

diff --git a/src/main/server.lisp b/src/main/server.lisp
index f086aa24242e4d55f6036c2e8cd08d9b2c94001b..bdf8d77c4e3c31fc27f427581cb64717bf4beb7c 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -3,17 +3,22 @@
 (defun server (port &optional (background t))
  (when (not *candle-dir*) (error "Need a candle dir"))
  (let*
-  ((data-dir (format nil "~Adata" *candle-dir*)))
+  ((data-dir (format nil "~Adata" *candle-dir*))
+   (log-dir (format nil "~Alogs/" *candle-dir*)))
   (ensure-directories-exist *candle-dir*)
   (ensure-directories-exist data-dir)
+  (ensure-directories-exist log-dir)
+  (setf log-utils:*log-dir* log-dir)
+  (log:add-appender #'log-utils:file-appender)
+  (log:info "Starting server on port ~A" port)
   (lame-db:load-known-dbs data-dir)
-  (format t "Starting processor in ~(~A~) mode~%" *job-system*)
+  (log:info "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~%")
+ (log:info "Starting Save Thread")
  (let*
   ((mutex (sb-thread:make-mutex))
    (waitq (sb-thread:make-waitqueue))
@@ -37,13 +42,19 @@
    :name "Save Thread Trigger")
   (push
    (lambda ()
-    (format t "Shutting down save thread~%")
+    (log:info "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 find-project-by-name-or-die (name)
+ (when name
+  (or
+   (find name *all-project* :test #'string= :key #'project-name)
+   (raise-candle-error :project-does-not-exist))))
+
 (defun add-project (name src)
  (when
   (not (cl-ppcre:scan "^[0-9A-Za-z-]*$" name))
@@ -63,7 +74,7 @@
 
 (defun refresh-project (name)
  (let*
-  ((project (find name *all-project* :test #'string= :key #'project-name))
+  ((project (find-project-by-name-or-die name))
    (branches (find-branch-by-project project)))
   (git project "fetch" "origin" "--prune")
   (multiple-value-bind (success code out err) (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*")
@@ -89,20 +100,18 @@
 
 (defun delete-project (name)
  (let
-  ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (raise-candle-error :project-does-not-exist))
+  ((project (find-project-by-name-or-die name)))
   (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))
   (nremove-project project)))
 
 (defun job->job-information (job)
- (list (job-sha job) (job-status job) (job-create-date job)))
+ (list (project-name (job-project job)) (job-sha job) (job-status job) (job-create-date job)))
 
 (defun project-branch-information (name)
  (let
-  ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (raise-candle-error :project-does-not-exist))
+  ((project (find-project-by-name-or-die name)))
   (mapcar
    (lambda (branch)
     (list
@@ -112,8 +121,7 @@
 
 (defun project-job-information (name)
  (let
-  ((project (when name (find name *all-project* :test #'string= :key #'project-name))))
-  (when (and name (not project)) (raise-candle-error :project-does-not-exist))
+  ((project (find-project-by-name-or-die name)))
   (mapcar #'job->job-information
    (if project
     (find-job-by-project project)
@@ -129,7 +137,6 @@
        (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) (raise-candle-error :project-does-not-exist))
   (when (not job) (raise-candle-error :job-does-not-exist))
   job))
 
@@ -145,13 +152,13 @@
   (lambda (project)
    (list
     (project-name project)
-    (project-src project)))
+    (project-src project)
+    (failures (project-name project))))
   *all-project*))
 
 (defun failures (project-name)
  (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))
+  ((project (find-project-by-name-or-die project-name)))
   (length
    (remove-if-not
     (lambda (branch) (eql :failed (job-status (branch-job branch))))