X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fserver.lisp;h=bdf8d77c4e3c31fc27f427581cb64717bf4beb7c;hb=ee77eb54acee4492045d4b5885bc5df332f58566;hp=320ffbda285c2dcfad6da964243779ce155de0ed;hpb=1f486261df0bbc1d8c10265e4736356934aa1b57;p=candle diff --git a/src/main/server.lisp b/src/main/server.lisp index 320ffbd..bdf8d77 100644 --- 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,7 +42,7 @@ :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)) @@ -102,7 +107,7 @@ (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