Skip to content

Commit

Permalink
Merge pull request #271 from saidone75/dev
Browse files Browse the repository at this point in the history
use edn/read-string for config file
  • Loading branch information
saidone75 authored May 26, 2024
2 parents 8f73921 + 9300b43 commit 02f2cb1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@
:dependencies [[org.clojure/clojure "1.11.3"]
[org.clojure/data.json "2.5.0"]
[org.clj-commons/clj-http-lite "1.0.13"]
[levand/immuconf "0.1.0"]
[com.taoensso/telemere "1.0.0-beta12"]]
:repl-options {:init-ns cral.alfresco})
4 changes: 2 additions & 2 deletions test/cral/fixtures.clj
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
(:require [clojure.java.io :as io]
[clojure.test :refer :all]
[cral.config :as c]
[immuconf.config :as immu]
[clojure.edn :as edn]
[taoensso.telemere :as t]))

(def config-file "resources/config.edn")

(defn setup [f]
(if (.exists (io/file config-file))
;; load configuration
(let [config (immu/load config-file)]
(let [config (edn/read-string (slurp config-file))]
(c/load-config config))
(t/log! :warn (format "unable to find %s, using defaults" config-file)))
(f))

0 comments on commit 02f2cb1

Please sign in to comment.