Merge branch 'turtle-bazon-master'

fukamachi · Jun 20, 2019 · 0c49a8e · 0c49a8e
2 parents 2fa9839 + 383dae6
commit 0c49a8e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/clack.lisp b/src/clack.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)))))))
diff --git a/src/handler/hunchentoot.lisp b/src/handler/hunchentoot.lisp
@@ -78,7 +78,7 @@
     (call-next-method)))
 
 (defun run (app &rest args
-            &key debug (port 5000) (address "0.0.0.0")
+            &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
                       :address address
                       :ssl-certificate-file ssl-cert-file
@@ -110,6 +111,7 @@
                (apply #'make-instance 'clack-acceptor
                       :app app
                       :debug debug
+                      :address address
                       :port port
                       :address address
                       :access-log-destination nil

diff --git a/src/handler/toot.lisp b/src/handler/toot.lisp
@@ -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
@@ -44,6 +44,7 @@
                                               (error (error)
                                                 (princ error *error-output*)
                                                 '(500 () ("Internal Server Error"))))))))
+                          :address address
                           :port port
                           :access-logger nil
                           (if ssl

diff --git a/src/handler/wookie.lisp b/src/handler/wookie.lisp
@@ -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")
@@ -78,11 +78,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))))