X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;f=bin%2Fcandle-server;h=5422abedb3e58ee833d97c7caa07dd1d7a307f67;hb=bf450bcba73aca7398aa7574627746d3e30b4022;hp=4d00ac08c66f075bd1587deba8df61de6453ec03;hpb=45649dd09c4d8294cfab3277a1c46f6e6ee1df6c;p=candle

diff --git a/bin/candle-server b/bin/candle-server
index 4d00ac0..5422abe 100755
--- a/bin/candle-server
+++ b/bin/candle-server
@@ -3,8 +3,10 @@
 (setf *compile-print* nil)
 (require 'asdf)
 (asdf:initialize-source-registry
- `(:source-registry (:tree ,(car (directory "src"))) :INHERIT-CONFIGURATION))
-(asdf:load-system :candle)
+ `(:source-registry (:tree ,(car (directory "."))) :INHERIT-CONFIGURATION))
+(let
+ ((*error-output* (make-broadcast-stream)))
+ (asdf:load-system :candle))
 (asdf:load-system :opera)
 
 (defpackage #:candle-server-cli (:use #:common-lisp))
@@ -13,7 +15,9 @@
 (defvar *options*
  '((:name :help :short "h" :long "help" :description "Print this usage.")
    (:name :port :short "p" :long "port" :takes-argument t :variable-name "PORT"
-    :description "Port on which to listen for commands.  Defaults to 25004")))
+    :description "Port on which to listen for commands.  Defaults to 25004")
+   (:name :port :long "candle-dir" :takes-argument t :variable-name "DIR"
+    :description "Directory for candle related data.  Will be created if does not exist.  Defaults to /opt/candle/")))
 
 (defun usage ()
  (format t "~A"
@@ -36,6 +40,10 @@
                 (opera:option-present :port options)
                 (parse-integer (opera:option-argument :port options) :junk-allowed t))
             25004)))
+   (setf candle:*candle-dir*
+    (if (opera:option-present :port options)
+     (opera:option-argument :port options)
+     "/opt/candle/"))
    (format t "Starting server on port ~A~%" port)
    (candle:server port nil)))))