- (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*)))