feat: Honor BARK_CONFIG env var across daemon and bb scripts

Author: bzg

README.org

@@ -164,7 +164,21 @@ bb export html --theme none                                 # no theme
 
 * Configuration
 
-See =config.edn.example=. The configuration has three main sections:
+See =config.edn.example=. The configuration has three main sections.
+
+** Config file location
+
+By default BARK reads =./config.edn= (from the current working
+directory).  To override:
+
+- Pass =-c <path>= to the JVM daemon: =clj -M:run -- -c /path/to/config.edn=
+- Or set the =BARK_CONFIG= env var — all =bb= scripts (=bb export=,
+  =bb notify=, =bb maintenance=, =bb test-config=, …) honor it.
+
+Precedence: CLI =-c= flag > =BARK_CONFIG= env var > =./config.edn=.
+
+The script-level =BARK_DB= env var (legacy) still works as a fallback
+when the config has no =:db {:path …}= entry.
 
 ** Mail source (=:mailbox=)
 

config.edn.example

@@ -1,3 +1,10 @@
+;; BARK config — reference template.
+;;
+;; By default BARK reads ./config.edn.  Override via:
+;;   - CLI:  clj -M:run -- -c /path/to/config.edn
+;;   - env:  BARK_CONFIG=/path/to/config.edn  (also honored by all bb scripts)
+;; Precedence: -c > BARK_CONFIG > ./config.edn.
+
 { ;; ---- Connection --------------------------------------------------------
 
  ;; Mail source — IMAP or Maildir. :folder defaults to "INBOX".

scripts/bark-docs.clj

@@ -19,7 +19,7 @@
          '[bark.common :refer [default-labels default-commands
                                resolve-labels-map resolve-commands-map
                                resolve-command-syntax
-                               parse-cli-args load-config build-source-map
+                               parse-cli-args load-config db-path build-source-map
                                format-date-iso bark-schema lead-maintainer]]
          '[bark.common-bb :refer [load-datalevin-pod! get-tenures]]
          '[bark.html-bb :refer [pico-cdn resolved-theme set-theme!
@@ -450,9 +450,9 @@
       effective-dir (or out-dir
                         (.getParent (io/file out-file)))
       ;; Load DB for maintainer names
-      db-path     (or (System/getenv "BARK_DB") "data/bark-db")
+      dbp         (db-path config)
       _           (load-datalevin-pod!)
-      conn        ((resolve 'pod.huahaiy.datalevin/get-conn) db-path bark-schema {:wal? false})
+      conn        ((resolve 'pod.huahaiy.datalevin/get-conn) dbp bark-schema {:wal? false})
       db          ((resolve 'pod.huahaiy.datalevin/db) conn)
       maint-html  (build-maintainers-html db source-name)
       config-html (build-configuration-html config source-name)

scripts/bark-export.clj

@@ -53,7 +53,7 @@
                                format-date format-date-iso
                                report-priority report-status report-descendant-count
                                parse-cli-args parse-delay parse-cutoff-date
-                               load-config build-source-map
+                               load-config db-path build-source-map
                                bark-schema bark-format
                                votes-by-report vote-counts
                                ics-file? text-attachment?]]
@@ -1256,8 +1256,9 @@
               topics-filter]
        :or {format "all"}}
       (parse-cli-args *command-line-args*)
-      db-path (or (System/getenv "BARK_DB") "data/bark-db")
-      conn    (d/get-conn db-path bark-schema {:wal? false})]
+      config  (load-config)
+      dbp     (db-path config)
+      conn    (d/get-conn dbp bark-schema {:wal? false})]
   (try
     (when-not (formats format)
       (log/error "Unknown format:" format)
@@ -1280,10 +1281,9 @@
                                    (.getTime ^java.util.Date last-export)))]
       (if skip?
         (log/info "Nothing changed since last export, skipping.")
-        ;; Resolve config and source list *before* the expensive DB pull
+        ;; Resolve source list *before* the expensive DB pull
         ;; so we can determine which sources actually need re-export.
-        (let [config          (load-config)
-              effective-theme (or theme (:theme config))
+        (let [effective-theme (or theme (:theme config))
               _               (when effective-theme (set-theme! effective-theme))
               source-map      (if config (build-source-map config) {})
               source-names    (if source-name

scripts/bark-maintenance.clj

@@ -23,7 +23,7 @@
 (require '[clojure.string :as str]
          '[taoensso.timbre :as log]
          '[bark.common :refer [parse-delay parse-cutoff-date
-                               load-config build-source-map
+                               load-config db-path build-source-map
                                bark-schema format-date
                                failures-file-path read-failures-file
                                reason-labels]]
@@ -148,18 +148,18 @@
 
 (let [{:keys [delete? verbose? failures? source-name] :as opts}
       (parse-args *command-line-args*)
-      db-path (or (System/getenv "BARK_DB") "data/bark-db")
       config  (load-config)
       _       (when-not config
                 (log/error "No config.edn found")
                 (System/exit 1))
+      dbp     (db-path config)
       source-map (build-source-map config)
       _       (when (and source-name (not (contains? source-map source-name)))
                 (log/error "Unknown source:" source-name)
                 (log/error "Available:" (str/join ", " (keys source-map)))
                 (System/exit 1))
       ;; Open with WAL for potential writes
-      conn    (d/get-conn db-path bark-schema {})]
+      conn    (d/get-conn dbp bark-schema {})]
   (try
     (let [db (d/db conn)]
       (if failures?

scripts/bark-notify.clj

@@ -22,7 +22,7 @@
          '[taoensso.timbre :as log]
          '[bark.common :refer [get-header format-date format-date-iso
                                report-priority report-status report-descendant-count
-                               load-config build-source-map
+                               load-config db-path build-source-map
                                bark-schema maintainer?
                                failures-file-path read-failures-file
                                reason-labels]]
@@ -330,16 +330,16 @@
         force?   (flags "--force")
         debug?   (flags "--debug")
         _        (when debug? (log/merge-config! {:min-level :debug}))
-        db-path  (or (System/getenv "BARK_DB") "data/bark-db")
         config   (load-config)
+        dbp      (db-path config)
         notif    (:notifications config)]
     (when-not (and notif (:enabled notif))
       (log/info "Notifications disabled in config.")
       (System/exit 0))
     (let [smtp (or (:smtp notif)
                    (do (log/error "No :smtp config under :notifications.")
                        (System/exit 1)))
-          conn (d/get-conn db-path bark-schema {:wal? false})]
+          conn (d/get-conn dbp bark-schema {:wal? false})]
       (try
         (let [db       (d/db conn)
               now      (java.util.Date.)

scripts/bark-stats.clj

@@ -18,7 +18,7 @@
          '[taoensso.timbre :as log]
          '[bark.common :refer [report-priority report-status
                                report-descendant-count format-date format-date-iso
-                               parse-cli-args load-config bark-schema
+                               parse-cli-args load-config db-path bark-schema
                                votes-by-report vote-counts]]
          '[bark.common-bb :refer [load-datalevin-pod! all-reports dq]]
          '[bark.html-bb :refer [pico-cdn resolved-theme set-theme!
@@ -35,8 +35,8 @@
 
 (def ^:private stats-js (slurp "resources/bark-stats.js"))
 
-(def db-path
-  (or (System/getenv "BARK_DB") "./data/bark-db"))
+;; db-path is resolved lazily inside generate-json! / generate-html!
+;; so loading this namespace doesn't force a config read.
 
 ;; ---------------------------------------------------------------------------
 ;; Time helpers
@@ -603,7 +603,7 @@
       (update :closed-cancel    #(some-> % (update-keys name)))))
 
 (defn- generate-json! [out-file source-name]
-  (let [conn (d/get-conn db-path bark-schema {:wal? false})]
+  (let [conn (d/get-conn (db-path (load-config)) bark-schema {:wal? false})]
     (try
       (let [db       (d/db conn)
             all-reps (all-reports db)

scripts/validate-config.clj

@@ -377,7 +377,9 @@
 ;; Main
 ;; ---------------------------------------------------------------------------
 
-(let [path (or (first *command-line-args*) "config.edn")
+(let [path (or (first *command-line-args*)
+               (System/getenv "BARK_CONFIG")
+               "config.edn")
       file (clojure.java.io/file path)]
   (if-not (.exists file)
     (do (log/error "Config file not found:" path)

src/bark/common.clj

@@ -592,13 +592,23 @@
 ;; ---------------------------------------------------------------------------
 
 (defn load-config
-  "Load config.edn if it exists, or nil."
-  ([] (load-config "config.edn"))
+  "Load config.edn if it exists, or nil.  With no args, consults the
+  BARK_CONFIG env var, falling back to ./config.edn — so all bb
+  scripts honor a single override point without per-script flags."
+  ([] (load-config (or (System/getenv "BARK_CONFIG") "config.edn")))
   ([path]
    (let [f (io/file path)]
      (when (.exists f)
        (edn/read-string (slurp f))))))
 
+(defn db-path
+  "Resolve the Datalevin DB path: prefer :db {:path …} from the
+  config, fall back to BARK_DB env var, then default \"data/bark-db\"."
+  [config]
+  (or (get-in config [:db :path])
+      (System/getenv "BARK_DB")
+      "data/bark-db"))
+
 (defn build-source-map
   "Build source-name -> config map from config."
   [config]

src/bark/main.clj

@@ -557,7 +557,9 @@
     {:watch?      (arg-set "--watch")
      :fresh?      (arg-set "--fresh")
      :cli-fetch   (some (fn [[a b]] (when (= "--fetch" a) b)) pairs)
-     :config-path (or (some (fn [[a b]] (when (= "-c" a) b)) pairs) "config.edn")}))
+     :config-path (or (some (fn [[a b]] (when (= "-c" a) b)) pairs)
+                      (System/getenv "BARK_CONFIG")
+                      "config.edn")}))
 
 (defn- confirm-fresh! [db-path]
   (print (str "Wipe DB at " db-path "? [y/N] ")) (flush)