Allow reading credentials from separate file #61

This commit is contained in:
Arnout Engelen 2020-10-07 19:13:32 +02:00
parent 926d25c063
commit 119ad90301
No known key found for this signature in database
GPG key ID: 061107B0F74A6DAA

View file

@ -20,15 +20,25 @@
(js/process.exit 1)) (js/process.exit 1))
(defn find-config [config-location] (defn find-config [config-location]
(let [config (or config-location (or config-location
(-> js/process .-env .-MASTODON_BOT_CONFIG) (-> js/process .-env .-MASTODON_BOT_CONFIG)
"config.edn")] "config.edn"))
(if (fs/existsSync config)
config
(exit-with-error (str "failed to read config: " config)))))
(defn load-config [config-location] (defn read-edn [config]
(if config
(if (fs/existsSync config)
;(edn/read-string (fs/readFileSync #js {:encoding "UTF-8"} config))
(edn/read-string (fs/readFileSync config "UTF-8"))
(exit-with-error (str "config file does not exist: " config)))
nil))
(defn load-credentials-config []
(read-edn (-> js/process .-env .-MASTODON_BOT_CREDENTIALS)))
(defn load-main-config [config-location]
(-> config-location (-> config-location
(find-config) (find-config)
(fs/readFileSync #js {:encoding "UTF-8"}) (read-edn)))
edn/read-string))
(defn load-config [config-location]
(merge (load-main-config config-location) (load-credentials-config)))