cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

move all 'config:from-env' calls to etc/config.lisp files

Browse source
This commit is contained in:
Helmut Merz 2025-03-04 10:44:40 +01:00
parent a671982cc5
commit 4c5639a9b9
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/demo/etc/config.lisp
View file

@ -6,6 +6,8 @@
:env-path (util:runtime-path ".env")) :env-path (util:runtime-path ".env"))
(config:add :logger :class 'logging:config (config:add :logger :class 'logging:config
:loglevel (config:from-env :loglevel :info)
:logfile (config:from-env :logfile "scopes.log")
:console nil) :console nil)
(config:add :server :class 'server:config (config:add :server :class 'server:config

4
logging.lisp
View file

@ -15,8 +15,8 @@
(console :reader console :initarg :console :initform t))) (console :reader console :initarg :console :initform t)))
(defun setup(cfg) (defun setup(cfg)
(let ((loglevel (config:from-env :loglevel (loglevel cfg))) (let ((loglevel (loglevel cfg))
(logfile (config:from-env :logfile (logfile cfg))) (logfile (logfile cfg))
(pat "%&%<%I%;<;;>;-5p [%D{%H:%M:%S}] %g{}{}{:downcase}:%2.2N%c{1}{}{:downcase} - %:_%m%>%n") (pat "%&%<%I%;<;;>;-5p [%D{%H:%M:%S}] %g{}{}{:downcase}:%2.2N%c{1}{}{:downcase} - %:_%m%>%n")
params) params)
(if (stringp loglevel) (if (stringp loglevel)

2
test/etc/config-core.lisp
View file

@ -5,7 +5,7 @@
(config:root) (config:root)
(config:add :logger :class 'logging:config (config:add :logger :class 'logging:config
:loglevel :info :loglevel (config:from-env :loglevel :info)
:logfile (t:test-path "scopes-test.log" "log") :logfile (t:test-path "scopes-test.log" "log")
:console nil) :console nil)

5
test/etc/config-web.lisp
View file

@ -2,17 +2,18 @@
(in-package :scopes/test-web) (in-package :scopes/test-web)
(config:root :env-keys '(:address :port)) (config:root :env-keys '(:loglevel :address :port))
(config:add :logger (config:add :logger
:class 'logging:config :class 'logging:config
:loglevel :debug :loglevel (config:from-env :loglevel :debug)
:logfile (t:test-path "scopes-test.log" "log") :logfile (t:test-path "scopes-test.log" "log")
:console nil) :console nil)
(config:add :server (config:add :server
:class 'server:config :class 'server:config
:port (config:from-env :port "8899") :port (config:from-env :port "8899")
:address (config:from-env :address "localhost")
:routes :routes
`((("hx") server:message-handler :html-responder cs-hx:response) `((("hx") server:message-handler :html-responder cs-hx:response)
(() server:fileserver (() server:fileserver