X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base.lisp;h=04cfa381d42324476b2605e930c6082e986076ea;hb=4545c194136bd916c6fd240a148804c5cccfec63;hp=a72ac57270b84aabc7fdc0738f3f523519f19787;hpb=f8ddd8423e2378c2f61f59ada19c1cbe928489f1;p=cl-modlisp.git

diff --git a/base.lisp b/base.lisp
index a72ac57..04cfa38 100644
--- a/base.lisp
+++ b/base.lisp
@@ -7,26 +7,30 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.5 2003/07/05 22:59:56 kevin Exp $
+;;;; $Id: base.lisp,v 1.7 2003/07/08 14:00:53 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
 (defun modlisp-start (&key (port +default-apache-port+)
-			   (function 'demo-apache-command-processor)
-			   (function-args nil))
-  (let ((listener (make-instance 'listener)))
+			   (processor 'demo-apache-command-processor)
+			   (processor-args nil)
+			   (catch-errors t))
+  (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
+				 :catch-errors catch-errors)))
     (handler-case
-	(make-socket-server (next-server-name) function port listener
-			    :format :text :wait nil
-			    :function-args function-args)
+	(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 (process socket)
-	(setf (process listener) process)
-	(setf (socket listener) socket)
+      (:no-error (res)
+	(declare (ignore res))
 	(push listener *active-listeners*)
 	listener))))
     
@@ -35,18 +39,21 @@
     (cmsg "listener is NIL in modlisp-stop")
     (return-from modlisp-stop))
   (dolist (worker (workers listener))
-    (close-active-socket (socket worker))
+    (close-active-socket (connection worker))
     (destroy-process (process worker)))
   (setf (workers listener) nil)
   (with-slots (process socket) listener
-    (handler-case
-	  (destroy-process process)
-      (error (e)
-	(format t "~&Error while trying to kill modlisp server~&  ~A" e)))
-    (when socket
-      (ignore-errors (close-passive-socket socket))))
+    (errorset (close-passive-socket socket) t)
+    (errorset (destroy-process process) t))
   (setq *active-listeners* (remove listener *active-listeners*)))
-    
+
+(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*))) 
 
@@ -57,20 +64,21 @@
       (*number-worker-requests* 0)
       (*close-apache-socket* t))
   
-  (defun apache-command-issuer (*apache-socket* processor-fun &rest args)
+  (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) 'done)
-	     (apply processor-fun command args)
+	       ((null command))
+	     (apply processor command args)
 	     (force-output *apache-socket*)
 	     (incf *number-worker-requests*)
 	     (incf *number-server-requests*)
 	     (when *close-apache-socket*
 	       (return))))
-      (close *apache-socket*)))
+      (close-active-socket *apache-socket*)))
+  
 
   (defun get-number-worker-requests ()
     *number-worker-requests*)
@@ -83,25 +91,32 @@
   
   ) ;; closure
 
+(defun header-value (header key)
+  (cdr (assoc key header :test #'string=)))
+
 (defun read-apache-command ()
   (ignore-errors
     (let* ((header (read-apache-header))
-	  (content-length (cdr (assoc "content-length" header :test #'equal)))
-	  (content (when content-length 
-		     (make-string
-		      (parse-integer content-length :junk-allowed t)))))
+	   (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-line *apache-socket* nil nil)
-			while (and key
-				   (string-not-equal key "end")
-				   (> (length key) 1))
-		      for value = (read-line *apache-socket* nil nil)
-		      collect (cons key value)))
+  (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)))
 
 (defun write-header-line (key value)
   (write-string key *apache-socket*)
@@ -109,6 +124,4 @@
   (write-string value *apache-socket*)
   (write-char #\NewLine *apache-socket*))
 
-(defun header-value (command key)
-  (cdr (assoc key command :test #'string=)))