[bknr-cvs] hans changed deployed/quickhoney/projects/quickhoney/src/

[BKNR Commits]

Revision: 4387
Author: hans
URL: http://bknr.net/trac/changeset/4387

hunchentoot 1.0 changes
U   deployed/quickhoney/projects/quickhoney/src/handlers.lisp
U   deployed/quickhoney/projects/quickhoney/src/init.lisp

Modified: deployed/quickhoney/projects/quickhoney/src/handlers.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/handlers.lisp	2009-05-08 09:54:06 UTC (rev 4386)
+++ deployed/quickhoney/projects/quickhoney/src/handlers.lisp	2009-05-08 10:09:10 UTC (rev 4387)
@@ -587,6 +587,10 @@
 (defclass shutdown-handler (admin-only-handler page-handler)
   ())
 
+(defvar *acceptor* nil)
+
 (defmethod handle ((handler shutdown-handler))
-  (hunchentoot:stop-server hunchentoot:*server*)
+  (when *acceptor*
+    (hunchentoot:stop *acceptor*)
+    (setf *acceptor* nil))
   "Shutting down HTTP server")

Modified: deployed/quickhoney/projects/quickhoney/src/init.lisp
===================================================================
--- deployed/quickhoney/projects/quickhoney/src/init.lisp	2009-05-08 09:54:06 UTC (rev 4386)
+++ deployed/quickhoney/projects/quickhoney/src/init.lisp	2009-05-08 10:09:10 UTC (rev 4387)
@@ -36,8 +36,9 @@
     (format t "; loading site configuration file~%")
     (let ((*package* (find-package :quickhoney.config)))
       (load "site-config.lisp")))
-  (bt:make-thread (curry #'hunchentoot:start-server
-                         :port *webserver-port*
-                         :threaded nil
-                         :persistent-connections-p nil)
+  (setf *acceptor* (make-instance 'hunchentoot:acceptor
+                                  :port *webserver-port*
+                                  :taskmaster 'hunchentoot:single-threaded-taskmaster
+                                  :persistent-connections-p nil))
+  (bt:make-thread (curry #'hunchentoot:start *acceptor*)
                   :name (format nil "HTTP server on port ~A" *webserver-port*)))