r5240: *** empty log message ***

[cl-modlisp.git] / base.lisp

diff --git a/base.lisp b/base.lisp
index 649d82f254d23ad400c65f0aa455737016372763..a72ac57270b84aabc7fdc0738f3f523519f19787 100644 (file)
--- a/base.lisp
+++ b/base.lisp
@@ -7,22 +7,11 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.4 2003/07/05 22:54:00 kevin Exp $
+;;;; $Id: base.lisp,v 1.5 2003/07/05 22:59:56 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
-(defun destroy-process (process)
-  #+sbcl (sb-thread:destroy-thread process)
-  #+cmucl (mp:destroy-process process)
-  #+allegro (mp:process-kill process)
-  #+lispworks (mp:process-kill process)
-  )
-
-(defun close-socket (sock)
-  (ignore-errors (close sock)))
-
-
 (defun modlisp-start (&key (port +default-apache-port+)
                           (function 'demo-apache-command-processor)
                           (function-args nil))
@@ -46,7 +35,7 @@
     (cmsg "listener is NIL in modlisp-stop")
     (return-from modlisp-stop))
   (dolist (worker (workers listener))
-    (close-socket (socket worker))
+    (close-active-socket (socket worker))
     (destroy-process (process worker)))
   (setf (workers listener) nil)
   (with-slots (process socket) listener
@@ -55,7 +44,7 @@
       (error (e)
        (format t "~&Error while trying to kill modlisp server~&  ~A" e)))
     (when socket
-      (ignore-errors (close-socket socket))))
+      (ignore-errors (close-passive-socket socket))))
   (setq *active-listeners* (remove listener *active-listeners*)))
     
 (defun next-server-name ()