Skip to content
Permalink
Browse files

Merge branch 'master' into no-server-restart-on-error

  • Loading branch information...
mohe2015 committed Aug 6, 2019
2 parents c28b8be + 8ce03fe commit 0e4ef063034ea791655602b9d8f5f37de5315d0a
Showing with 11 additions and 5 deletions.
  1. +3 −2 src/clack.lisp
  2. +3 −1 src/handler/hunchentoot.lisp
  3. +2 −1 src/handler/toot.lisp
  4. +3 −1 src/handler/wookie.lisp
@@ -70,6 +70,7 @@

(defun clackup (app &rest args
&key (server :hunchentoot)
(address "127.0.0.1")
(port 5000)
(debug t)
silent
@@ -94,7 +95,7 @@
(find-handler server)
(when (and (not use-thread)
(not silent))
(format t "~&~:(~A~) server is going to start.~%Listening on localhost:~A.~%" server port))
(format t "~&~:(~A~) server is going to start.~%Listening on ~A:~A.~%" server address port))
(with-handle-interrupt (lambda ()
(format *error-output* "Interrupted"))
(prog1
@@ -105,4 +106,4 @@
(delete-from-plist args :server :port :debug :silent :use-thread))
(when (and use-thread
(not silent))
(format t "~&~:(~A~) server is started.~%Listening on localhost:~A.~%" server port)))))))
(format t "~&~:(~A~) server is started.~%Listening on ~A:~A.~%" server address port)))))))
@@ -78,7 +78,7 @@
(call-next-method)))

(defun run (app &rest args
&key debug (port 5000)
&key debug (address "127.0.0.1") (port 5000)
ssl ssl-key-file ssl-cert-file ssl-key-password
max-thread-count max-accept-count (persistent-connections-p t))
"Start Hunchentoot server."
@@ -98,6 +98,7 @@
(apply #'make-instance 'clack-ssl-acceptor
:app app
:debug debug
:address address
:port port
:ssl-certificate-file ssl-cert-file
:ssl-privatekey-file ssl-key-file
@@ -109,6 +110,7 @@
(apply #'make-instance 'clack-acceptor
:app app
:debug debug
:address address
:port port
:access-log-destination nil
:error-template-directory nil
@@ -20,7 +20,7 @@
(in-package :clack.handler.toot)

(defun run (app &rest args
&key debug (port 5000)
&key debug (address "127.0.0.1") (port 5000)
ssl ssl-key-file ssl-cert-file ssl-key-password)
"Start Toot server."
(cond
@@ -47,6 +47,7 @@
(error (error)
(princ error *error-output*)
'(500 () ("Internal Server Error"))))))))
:address address
:port port
:access-logger nil
(if ssl
@@ -53,7 +53,7 @@
(setf (wookie:request-store-body request) t))

(defun run (app &rest args
&key (debug t) (port 5000)
&key (debug t) (address "127.0.0.1") (port 5000)
ssl ssl-key-file ssl-cert-file ssl-key-password)
(cond
((asdf::getenv "SERVER_STARTER_PORT")
@@ -81,11 +81,13 @@
(let ((listener
(if ssl
(make-instance 'wookie:ssl-listener
:bind address
:port port
:key ssl-key-file
:certificate ssl-cert-file
:password ssl-key-password)
(make-instance 'wookie:listener
:bind address
:port port))))
(start-server listener)))
(as:socket-closed () nil))))

0 comments on commit 0e4ef06

Please sign in to comment.
You can’t perform that action at this time.