diff --git a/app/demo/etc/config.lisp b/app/demo/etc/config.lisp index 96320c4..df6ec88 100644 --- a/app/demo/etc/config.lisp +++ b/app/demo/etc/config.lisp @@ -6,6 +6,8 @@ :env-path (util:runtime-path ".env")) (config:add :logger :class 'logging:config + :loglevel (config:from-env :loglevel :info) + :logfile (config:from-env :logfile "scopes.log") :console nil) (config:add :server :class 'server:config diff --git a/logging.lisp b/logging.lisp index 9b1366c..b36143b 100644 --- a/logging.lisp +++ b/logging.lisp @@ -15,8 +15,8 @@ (console :reader console :initarg :console :initform t))) (defun setup(cfg) - (let ((loglevel (config:from-env :loglevel (loglevel cfg))) - (logfile (config:from-env :logfile (logfile cfg))) + (let ((loglevel (loglevel cfg)) + (logfile (logfile cfg)) (pat "%&%<%I%;<;;>;-5p [%D{%H:%M:%S}] %g{}{}{:downcase}:%2.2N%c{1}{}{:downcase} - %:_%m%>%n") params) (if (stringp loglevel) diff --git a/test/etc/config-core.lisp b/test/etc/config-core.lisp index cd27199..4b94a28 100644 --- a/test/etc/config-core.lisp +++ b/test/etc/config-core.lisp @@ -5,7 +5,7 @@ (config:root) (config:add :logger :class 'logging:config - :loglevel :info + :loglevel (config:from-env :loglevel :info) :logfile (t:test-path "scopes-test.log" "log") :console nil) diff --git a/test/etc/config-web.lisp b/test/etc/config-web.lisp index 94a28f6..0d57f9a 100644 --- a/test/etc/config-web.lisp +++ b/test/etc/config-web.lisp @@ -2,17 +2,18 @@ (in-package :scopes/test-web) -(config:root :env-keys '(:address :port)) +(config:root :env-keys '(:loglevel :address :port)) (config:add :logger :class 'logging:config - :loglevel :debug + :loglevel (config:from-env :loglevel :debug) :logfile (t:test-path "scopes-test.log" "log") :console nil) (config:add :server :class 'server:config :port (config:from-env :port "8899") + :address (config:from-env :address "localhost") :routes `((("hx") server:message-handler :html-responder cs-hx:response) (() server:fileserver