;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Dec 2002
;;;;
-;;;; $Id: base.lisp,v 1.6 2003/07/08 06:40:00 kevin Exp $
+;;;; $Id: base.lisp,v 1.12 2003/07/11 07:00:57 kevin Exp $
;;;; *************************************************************************
(in-package #:modlisp)
-(defun modlisp-start (&key (port +default-apache-port+)
- (processor 'demo-apache-command-processor)
- (processor-args nil))
+(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 ((listener (make-instance 'listener :port port
- :name (next-server-name)
- :function 'apache-command-issuer
+ :base-name "modlisp"
+ :function 'modlisp-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))))
-
+ :wait nil
+ :catch-errors catch-errors
+ :timeout timeout
+ :number-fixed-workers number-fixed-workers
+ :remote-host-checker remote-host-checker)))
+ (init/listener listener :start)))
+
+
(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*)))
+ (init/listener listener :stop))
(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*)))
+ (stop-all/listener))
-(defun next-worker-name ()
- (format nil "modlisp-worker-~d" (incf *worker-count*)))
+;; Internal functions
-(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)))
+(defun modlisp-command-issuer (*modlisp-socket* processor &rest args)
+ "generates commands from modlisp, issues commands to processor-fun"
+ (unwind-protect
+ (progn
+ (let ((*number-worker-requests* 0)
+ (*close-modlisp-socket* t))
+ (do ((command (read-modlisp-command) (read-modlisp-command)))
((null command))
(apply processor command args)
- (force-output *apache-socket*)
+ (finish-output *modlisp-socket*)
(incf *number-worker-requests*)
(incf *number-server-requests*)
- (when *close-apache-socket*
- (return))))
- (close-active-socket *apache-socket*)))
+ (when *close-modlisp-socket*
+ (return)))))
+ (close-active-socket *modlisp-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
-
(defun header-value (header key)
+ "Returns the value of a modlisp header"
(cdr (assoc key header :test #'string=)))
-(defun read-apache-command ()
+(defun read-modlisp-command ()
(ignore-errors
- (let* ((header (read-apache-header))
+ (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 *apache-socket*)
+ (read-sequence content *modlisp-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-modlisp-line ()
+ (kmrcl:string-right-trim-one-char
+ #\return
+ (read-line *modlisp-socket* nil nil)))
-(defun read-apache-header ()
- (loop for key = (read-apache-line)
+(defun read-modlisp-header ()
+ (loop for key = (read-modlisp-line)
while (and key
(string-not-equal key "end")
(> (length key) 1))
- for value = (read-apache-line)
+ for value = (read-modlisp-line)
collect (cons 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 key *modlisp-socket*)
+ (write-char #\NewLine *modlisp-socket*)
+ (write-string value *modlisp-socket*)
+ (write-char #\NewLine *modlisp-socket*))
projects / cl-modlisp.git / blobdiff