diff --git a/qlfile b/qlfile index d0caa0a..4b64711 100644 --- a/qlfile +++ b/qlfile @@ -4,7 +4,6 @@ ql cl-jingle git hsx https://github.com/skyizwhite/hsx.git git ningle-fbr https://github.com/skyizwhite/ningle-fbr.git ql cl-ppcre -ql log4cl ql function-cache ql trivial-backtrace ql parenscript diff --git a/qlfile.lock b/qlfile.lock index 73e8c63..007ec94 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -26,10 +26,6 @@ (:class qlot/source/ql:source-ql :initargs (:%version :latest) :version "ql-2023-10-21")) -("log4cl" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2023-10-21")) ("function-cache" . (:class qlot/source/ql:source-ql :initargs (:%version :latest) diff --git a/src/app.lisp b/src/app.lisp index 5fd0725..c8222e9 100644 --- a/src/app.lisp +++ b/src/app.lisp @@ -3,7 +3,7 @@ (:use #:cl) (:local-nicknames (#:jg #:jingle)) (:local-nicknames (#:fbr #:ningle-fbr)) - (:local-nicknames (#:cfg #:hp/config/env)) + (:local-nicknames (#:env #:hp/env)) (:local-nicknames (#:mw #:hp/middlewares/*)) (:export #:start #:stop @@ -11,7 +11,7 @@ (in-package #:hp) (defparameter *app* (jg:make-app :address "localhost" - :port cfg:*port*)) + :port env:*port*)) (defun start () (jg:start *app*)) diff --git a/src/config/lib.lisp b/src/config/lib.lisp deleted file mode 100644 index db6fc43..0000000 --- a/src/config/lib.lisp +++ /dev/null @@ -1,6 +0,0 @@ -(defpackage #:hp/config/lib - (:use #:cl) - (:import-from #:log4cl)) -(in-package #:hp/config/lib) - -(log:config :nofile) diff --git a/src/config/env.lisp b/src/env.lisp similarity index 90% rename from src/config/env.lisp rename to src/env.lisp index 0727fc6..9b9179c 100644 --- a/src/config/env.lisp +++ b/src/env.lisp @@ -1,9 +1,9 @@ -(defpackage #:hp/config/env +(defpackage #:hp/env (:use #:cl) (:export #:dev-mode-p #:prod-mode-p #:*port*)) -(in-package #:hp/config/env) +(in-package #:hp/env) (defmacro defenv (name env &key default parser) (let ((env-val (gensym "val"))) diff --git a/src/middlewares/access-logger.lisp b/src/middlewares/access-logger.lisp deleted file mode 100644 index 035b559..0000000 --- a/src/middlewares/access-logger.lisp +++ /dev/null @@ -1,14 +0,0 @@ -(defpackage #:hp/middlewares/access-logger - (:use #:cl) - (:import-from #:lack.middleware.accesslog - #:*lack-middleware-accesslog*) - (:import-from #:log4cl) - (:export *access-logger*)) -(in-package #:hp/middlewares/access-logger) - -(defparameter *access-logger* - (lambda (app) - (funcall *lack-middleware-accesslog* - app - :logger (lambda (message) - (log:info message))))) diff --git a/src/middlewares/recoverer.lisp b/src/middlewares/recoverer.lisp index d400189..6a387de 100644 --- a/src/middlewares/recoverer.lisp +++ b/src/middlewares/recoverer.lisp @@ -2,12 +2,12 @@ (:use #:cl) (:import-from #:log4cl) (:local-nicknames (#:tb #:trivial-backtrace)) - (:local-nicknames (#:cfg #:hp/config/env)) + (:local-nicknames (#:env #:hp/env)) (:export #:*recoverer*)) (in-package #:hp/middlewares/recoverer) (defun message (condition) - (if (cfg:dev-mode-p) + (if (env:dev-mode-p) (tb:print-backtrace condition :output nil) "Internal Server Error")) diff --git a/src/response.lisp b/src/response.lisp index 1ec6d25..22a16ea 100644 --- a/src/response.lisp +++ b/src/response.lisp @@ -2,7 +2,6 @@ (:use #:cl) (:import-from #:hsx) (:local-nicknames (#:jg #:jingle)) - (:local-nicknames (#:cfg #:hp/config/env)) (:local-nicknames (#:cmp #:hp/components/*)) (:export #:response #:partial-response))