diff --git a/config.lisp b/config.lisp index fa525ce..f9a1056 100644 --- a/config.lisp +++ b/config.lisp @@ -24,12 +24,10 @@ (let* ((prefix (env-prefix cfg)) (ep (env-path cfg)) (dotenv-data (if ep (dotenv:read-env ep)))) - (print dotenv-data) (dolist (sl (override-keys cfg)) (let* ((key (str:concat prefix (string sl))) (env-val (uiop:getenv key)) - (dotenv-val (gethash key dotenv-data))) - (format t "~%key: ~s, env-val: ~s, dotenv-val: ~s " key env-val dotenv-val) + (dotenv-val (if dotenv-data (gethash key dotenv-data)))) (if env-val (setf (slot-value cfg sl) env-val) (if dotenv-val diff --git a/test/test-config.lisp b/test/test-config.lisp index 1f03a28..c8b2ba2 100644 --- a/test/test-config.lisp +++ b/test/test-config.lisp @@ -29,14 +29,10 @@ (t:show-result))) (t:deftest test-make-path () - (format t "~&test-path (config): ~s" (t:test-path "config")) - (format t "~&test-path (data): ~s" (t:test-path "test.db" "data")) - (format t "~&runtime-path: ~s" (util:runtime-path "config" "app" "etc")) - (format t "~&runtime-path (.env): ~s" (util:runtime-path ".env" "app")) - (format t "~&home-path: ~s" (util:home-path ".env.txt" "development" "cco"))) + ;(format t "~&runtime-path (.env): ~s" (util:runtime-path ".env" "app")) + ;(format t "~&home-path: ~s" (util:home-path ".env.txt" "lisp" "cl-scopes")) + (== (pathname-name (util:home-path ".env.txt" "lisp" "cl-scopes")) ".env")) (t:deftest test-env-override () - (format t "~&override-keys: ~s~%" (config:override-keys *config*)) - (format t "~&env-path ~s~%" (config:env-path *config*)) (== (user *config*) "user-from-env-file") (== (password *config*) "very_secret"))