diff options
| author | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2018-07-29 14:27:36 +0200 |
|---|---|---|
| committer | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2018-07-29 14:27:36 +0200 |
| commit | 88c78f464129856da0c980bc808f8fdeafae8e1c (patch) | |
| tree | 59ef0b8de42f6ab0c6cce1d33c4b707fde8a0d0a | |
| parent | 3620af87e5a466e794491b790728a7384b83ef57 (diff) | |
Load site.lisp at runtime.
Loading site.lisp on startup rather than at compile-time is necessary
to make the Docker/Kubernetes use case work.
| -rw-r--r-- | mulkcms-hunchentoot.lisp | 4 | ||||
| -rw-r--r-- | mulkcms.lisp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mulkcms-hunchentoot.lisp b/mulkcms-hunchentoot.lisp index 4d7f3c1..f26ea7e 100644 --- a/mulkcms-hunchentoot.lisp +++ b/mulkcms-hunchentoot.lisp @@ -79,6 +79,10 @@ *acceptor*) (defun run-server () + (format t "~&Loading site configuration.") + (load "site.lisp") + (format t "~&Starting site: ~A" mulkcms::*site-name*) + (terpri) (let ((acceptor (start-server))) (unwind-protect (loop diff --git a/mulkcms.lisp b/mulkcms.lisp index 8d5ff6e..d1f866e 100644 --- a/mulkcms.lisp +++ b/mulkcms.lisp @@ -1,9 +1,5 @@ (in-package #:mulkcms) -(defparameter *database-connection-spec* - (list *database-name* *database-user* *database-password* *database-host* - :pooled-p t :use-ssl :no)) - (defvar *requested-characteristics*) (defvar *propagated-params*) (defvar *use-ssl-p*) @@ -290,7 +286,9 @@ (:pingback "/rpc"))))) (defun call-with-db (thunk) - (call-with-connection *database-connection-spec* thunk)) + (call-with-connection (list *database-name* *database-user* *database-password* *database-host* + :pooled-p t :use-ssl :no) + thunk)) (defmacro with-db (&body body) `(call-with-db (lambda () ,@body))) |