X-Git-Url: http://git.kpe.io/?p=cl-modlisp.git;a=blobdiff_plain;f=base.lisp;h=ef54314d12761284a40b2417280c577d008601d5;hp=bcf84b5e049c22fb46e56ababd74bf9ab3c4d1e2;hb=HEAD;hpb=cb60460c044d8e4c1270b30acd43853ef4ef8f94 diff --git a/base.lisp b/base.lisp index bcf84b5..ef54314 100644 --- a/base.lisp +++ b/base.lisp @@ -7,119 +7,98 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: base.lisp,v 1.6 2003/07/08 06:40:00 kevin Exp $ +;;;; $Id$ ;;;; ************************************************************************* (in-package #:modlisp) -(defun modlisp-start (&key (port +default-apache-port+) - (processor 'demo-apache-command-processor) - (processor-args nil)) - (let ((listener (make-instance 'listener :port port - :name (next-server-name) - :function 'apache-command-issuer - :function-args (cons processor processor-args) - :format :text - :wait nil))) - (handler-case - (make-socket-server listener) - (error (e) - (format t "~&Error while trying to start modlisp server~& ~A" e) - (decf *listener-count*) - (values nil nil)) - (:no-error (res) - (declare (ignore res)) - (push listener *active-listeners*) - listener)))) - -(defun modlisp-stop (listener) - (unless listener - (cmsg "listener is NIL in modlisp-stop") - (return-from modlisp-stop)) - (dolist (worker (workers listener)) - (close-active-socket (connection worker)) - (destroy-process (process worker))) - (setf (workers listener) nil) - (with-slots (process socket) listener - (errorset (close-passive-socket socket) t) - (errorset (destroy-process process) t)) - (setq *active-listeners* (remove listener *active-listeners*))) +(defun modlisp-start (&key (port +default-modlisp-port+) + (processor 'demo-modlisp-command-processor) + (processor-args nil) + (catch-errors t) + timeout + number-fixed-workers + remote-host-checker) + (let* ((server (make-instance 'ml-server + :processor processor + :processor-args processor-args + :port port)) + (listener (make-instance 'listener :port port + :base-name "modlisp" + :function 'modlisp-command-issuer + :function-args (list server) + :format :text + :wait nil + :catch-errors catch-errors + :timeout timeout + :number-fixed-workers number-fixed-workers + :remote-host-checker remote-host-checker))) + (setf (listener server) listener) + (init/listener listener :start) + (setf *ml-server* server) + server)) + + +(defun modlisp-stop (server) + (init/listener (listener server) :stop) + (setf (listener server) nil) + server) (defun modlisp-stop-all () - (dolist (listener *active-listeners*) - (ignore-errors - (progn - (modlisp-stop listener) - (setq *active-listeners* (remove listener *active-listeners*)))))) - -(defun next-server-name () - (format nil "modlisp-socket-server-~d" (incf *listener-count*))) - -(defun next-worker-name () - (format nil "modlisp-worker-~d" (incf *worker-count*))) - -(let ((*number-server-requests* 0) - (*number-worker-requests* 0) - (*close-apache-socket* t)) - - (defun apache-command-issuer (*apache-socket* processor &rest args) - "generates commands from apache, issues commands to processor-fun" - (unwind-protect - (progn - (setq *number-worker-requests* 0) - (do ((command (read-apache-command) (read-apache-command))) - ((null command)) - (apply processor command args) - (force-output *apache-socket*) - (incf *number-worker-requests*) - (incf *number-server-requests*) - (when *close-apache-socket* - (return)))) - (close-active-socket *apache-socket*))) - - - (defun get-number-worker-requests () - *number-worker-requests*) - - (defun get-number-server-requests () - *number-server-requests*) - - (defun set-close-apache-socket (close?) - (setq *close-apache-socket* close?)) - - ) ;; closure + (stop-all/listener)) + +;; Internal functions + +(defun modlisp-command-issuer (*modlisp-socket* server) + "generates commands from modlisp, issues commands to processor-fun" + (unwind-protect + (progn + (let ((*number-worker-requests* 0) + (*close-modlisp-socket* t) + (*ml-server* server)) + (do ((command (read-modlisp-command) (read-modlisp-command))) + ((null command)) + (apply (processor server) command (processor-args server)) + (finish-output *modlisp-socket*) + (incf *number-worker-requests*) + (incf *number-server-requests*) + (when *close-modlisp-socket* + (return))))) + (close-active-socket *modlisp-socket*))) (defun header-value (header key) - (cdr (assoc key header :test #'string=))) + "Returns the value of a modlisp header" + (cdr (assoc key header :test #'eq))) -(defun read-apache-command () +(defun read-modlisp-command () (ignore-errors - (let* ((header (read-apache-header)) - (content-length (header-value header "content-length")) - (content (when content-length - (make-string - (parse-integer content-length :junk-allowed t))))) - (when content - (read-sequence content *apache-socket*) - (push (cons "posted-content" content) header)) - header))) - -(defun read-apache-line () - (kmrcl:string-left-trim-one-char #\return - (read-line *apache-socket* nil nil))) - -(defun read-apache-header () - (loop for key = (read-apache-line) - while (and key - (string-not-equal key "end") - (> (length key) 1)) - for value = (read-apache-line) - collect (cons key value))) + (let* ((header (read-modlisp-header)) + (content-length (header-value header :content-length)) + (content (when content-length + (make-string + (parse-integer content-length :junk-allowed t))))) + (when content + (read-sequence content *modlisp-socket*) + (push (cons :posted-content content) header)) + header))) + + +(defun read-modlisp-line () + (kmrcl:string-right-trim-one-char + #\return + (read-line *modlisp-socket* nil nil))) + + +(defun read-modlisp-header () + (loop for key = (read-modlisp-line) + while (and key (string-not-equal key "end")) + for value = (read-modlisp-line) + collect (cons (ensure-keyword key) value))) (defun write-header-line (key value) - (write-string key *apache-socket*) - (write-char #\NewLine *apache-socket*) - (write-string value *apache-socket*) - (write-char #\NewLine *apache-socket*)) + (write-string (string key) *modlisp-socket*) + (write-char #\NewLine *modlisp-socket*) + (write-string value *modlisp-socket*) + (write-char #\NewLine *modlisp-socket*))