-(let ((*listener-socket* nil)
- (*listener-process* nil))
-
- (defun modlisp-start (&key (port +default-apache-port+)
- (function 'demo-apache-command-processor))
- (handler-case
- (make-socket-server (next-server-name) function port
- :format :text :wait nil)
- (error (e)
- (format t "~&Error while trying to start modlisp server~& ~A" e)
- (decf *listener-count*)
- nil)
- (:no-error (process socket)
- (setq *listener-socket* socket)
- (setq *listener-process* process)
- process)))
-
- (defun modlisp-stop ()
- (when *listener-process*
- (format t "~&; killing modlisp server process ~A~%" *listener-process*)
- (handler-case
- (progn
- #+sbcl (sb-thread:destroy-thread *listener-process*)
- #+cmucl (mp:destroy-process *listener-process*)
- #+allegro (mp:process-kill *listener-process*)
- #+allegro (mp:process-allow-schedule)
- #+lispworks (mp:process-kill *listener-process*))
- (error (e)
- (format t "~&Error while trying to kill modlisp server~& ~A" e))
- (:no-error (res)
- (declare (ignore res))
- (setq *listener-process* nil))))
- (when *listener-socket*
- (ignore-errors (close *listener-socket*))
- (setq *listener-socket* nil)))
-
- ) ;; closure
-
-(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-fun)
- "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)
- (funcall processor-fun command)
- (force-output *apache-socket*)
- (incf *number-worker-requests*)
- (incf *number-server-requests*)
- (when *close-apache-socket*
- (return))))
- (close *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
-
-(defun read-apache-command ()
+
+(defun modlisp-stop (server)
+ (init/listener (listener server) :stop)
+ (setf (listener server) nil)
+ server)
+
+(defun modlisp-stop-all ()
+ (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)
+ "Returns the value of a modlisp header"
+ (cdr (assoc key header :test #'eq)))
+
+(defun read-modlisp-command ()