diff options
| -rw-r--r-- | oneliners.api.asd | 4 | ||||
| -rw-r--r-- | src/main.lisp | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/oneliners.api.asd b/oneliners.api.asd index c23d5e7..abf2f50 100644 --- a/oneliners.api.asd +++ b/oneliners.api.asd @@ -8,8 +8,8 @@ "jonathan" "ironclad" "uuid" - "lambda-riffs" - "swank") + "lambda-riffs") + :components ((:module "src" :components ((:file "package") diff --git a/src/main.lisp b/src/main.lisp index b143d60..6dc2c7b 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -229,8 +229,6 @@ (lzb:set-canned-response *server* 404 "Not Found" "text/plain") (lzb:set-canned-response *server* 500 "Server Error" "text/plain")) -(defvar *swank-thread* nil) - (defun salt-from-file (path) "Get server salt from a file, making one if not already extant. It is recommended to keep this file somewhere other than the host where @@ -279,8 +277,6 @@ contributors will be made. You should destroy this file after the initial boot up, subsequent boots will not need it, even if it remains mentioned in th config file. -:SWANK-PORT, if provided, indicates that a swank server should be -started, this will allow remote live debugging of the system. " (handler-case (progn @@ -289,8 +285,9 @@ started, this will allow remote live debugging of the system. (with-open-file (input config-file) (read input)))) (with-plist - (port address salt-file domain store-dir init-admins-file swank-port) config + (port address salt-file domain store-dir init-admins-file) config ;; start the server with options in the config. + (apply 'start (nconc (when port (list :port port)) @@ -301,12 +298,7 @@ started, this will allow remote live debugging of the system. (when store-dir (list :store-dir store-dir)))) ;; make any admins listed. (when init-admins-file - (make-admins-from-file init-admins-file)) - (when swank-port - (setf *swank-thread* - (bt:make-thread - (lambda () (swank:create-server :port swank-port :dont-close t)))) - (format t "started swank server on ~a~%" swank-port))))) + (make-admins-from-file init-admins-file))))) (error (err) (format t "Caught error ~a~%" err)))) |