Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print a warning when config cannot be found #35

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Print a warning when config cannot be found #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9328e3c
Print a warning when config cannot be found
noprompt Mar 30, 2019
75873c6
Annotate read config with :source meta, clearer missing config error …
noprompt Apr 1, 2019
83ad8c3
Undelete defconfig!
noprompt Apr 1, 2019
2a489b6
Use autogensym
noprompt Apr 2, 2019
c25143a
Add config-source test
noprompt Apr 25, 2019
6e6e4e6
Use delay instead of atom
noprompt Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/outpace/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,20 @@
"Finds and loads config."
[]
(if-let [source (find-config-source)]
(read-config source)
(with-meta (read-config source) :source source)
{}))

(def config
"The delayed map of explicit configuration values."
(delay (load-config)))

(defn config-source
"Returns the source of config as string or nil if no source was
found."
[]
(when-let [source (:source (meta @config))]
(str source)))

(defn present?
"Returns true if a configuration entry exists for the qname and, if an
Optional value, the value is provided."
Expand Down Expand Up @@ -272,7 +279,10 @@
(if (present? qname#)
(alter-var-root var# (constantly (lookup qname#)))
(when (and (-> var# meta :required) (not generating?))
(throw (Exception. (str "Missing required value for config var: " qname#)))))
(let [message# (if-let [source# (config-source)]
(str "Config var " qname# " must define a default or be specified in " source#)
(str "Config var " qname# " must define a default when there is no config source"))]
(throw (Exception. message#)))))
(when-let [validate# (and (bound? var#) (-> var# meta :validate))]
(validate @var# qname# validate#)))
var#))
Expand Down
3 changes: 2 additions & 1 deletion src/outpace/config/bootstrap.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
(io/resource res)
(or (System/getProperty "config.edn")
(when (.exists (io/file "config.edn"))
"config.edn")))))
"config.edn")))
(println "WARNING: no config source could be found.")))
6 changes: 6 additions & 0 deletions test/outpace/config_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,9 @@
(is (not (c/provided? #{(extractable "bar" false)})))
(is (not (c/provided? (list (extractable "bar" false)))))
(is (not (c/provided? [(extractable "bar" false)])))))

(deftest config-source-test
(let [source "config.clj"
config (delay (with-meta {} {:source source}))]
(with-redefs [c/config config]
(is (= source (c/config-source))))))