core: allow configuring minimal log level, default :info

- refactored weepinbell.core/start-system. moved config loading outside
start-system, loaded in -main function.
- use :log-level in config and set timbre :min-level in -main

4 files changed, 27 insertions, 20 deletions

diff --git a/dev/user.clj b/dev/user.clj
index 04e0526..4774756 100644
--- a/dev/user.clj
+++ b/dev/user.clj
@@ -1,6 +1,7 @@
 (ns user
   (:require [clj-reload.core :as reload]
             [nextjournal.beholder :as beholder]
+            [weepinbell.config :refer [load-config]]
             [weepinbell.core]))
 
 (reload/init
@@ -10,7 +11,9 @@
 
 (defn start []
   {:pre [(nil? @stop-fn)]}
-  (reset! stop-fn (@(resolve 'weepinbell.core/start-system))))
+  (reset! stop-fn 
+          (@(resolve 'weepinbell.core/start-system)
+           (load-config "config.edn"))))
 
 (defn stop []
   {:pre [(fn? @stop-fn)]}
diff --git a/resources/config.edn b/resources/config.edn
index 3c6ea6e..e45eb8a 100644
--- a/resources/config.edn
+++ b/resources/config.edn
@@ -9,4 +9,5 @@
            :on-delete []}
  :webhook-request-fn nil
  :feed-length 8
- :pipeline-concurrency 5}
+ :pipeline-concurrency 5
+ :log-level :info}
diff --git a/src/weepinbell/core.clj b/src/weepinbell/core.clj
index 2a16335..9082c36 100644
--- a/src/weepinbell/core.clj
+++ b/src/weepinbell/core.clj
@@ -18,15 +18,12 @@
 (defn start-system
   "Start webmention processor and webserver in the background.
    Returns a function that performs a graceful shutdown."
-  []
+  [config]
   {:post [fn?]}
   (let [;; webmention channel 
         ;; Receiver puts webmention requests in. 
         ;; Processor takes them out.
         wmc (chan)
-        ;; Weepinbell configuration, 
-        ;; loaded from config.edn and merged with defaults.
-        config (load-config (or (System/getenv "WEEPINBELL_CONFIG") "config.edn"))
         ;; Storage middle layer, a map of data-manipulating functions.
         ;; Supports various storage as long as the map conforms storage.spec.
         bare-store (edn/use-store (:data-path config))
@@ -53,18 +50,23 @@
 ; Entry point; Terminal user interface
 ;; start up system and wait for signals to perform graceful shutdown
 (defn -main [& _]
-  (timbre/info "starting weepinbell...")
-  (let [done-chan (chan 1)
-        stop-system (start-system)]
+  (let [config-file (or (System/getenv "WEEPINBELL_CONFIG") "config.edn")
+        config (load-config config-file)
+        log-level (or (System/getenv "WEEPINBELL_LOGLEVEL") 
+                      (:log-level config) :info)]
+    (timbre/merge-config! {:min-level log-level})
+    (timbre/info "starting weepinbell...")
+    (let [done-chan (chan 1)
+          stop-system (start-system config)]
     ;; Register signal handlers for SIGINT and SIGTERM
-    (doseq [signal ["INT" "TERM"]]
-      (Signal/handle (Signal. signal)
-                     (reify SignalHandler
-                       (handle [_ sig]
-                         (stop-system)
-                         (timbre/info "signal" (.getName sig) "received."
-                                      "gracefully shut down weepinbell.")
-                         (>!! done-chan true)))))
+      (doseq [signal ["INT" "TERM"]]
+        (Signal/handle (Signal. signal)
+                       (reify SignalHandler
+                         (handle [_ sig]
+                           (stop-system)
+                           (timbre/info "signal" (.getName sig) "received."
+                                        "gracefully shut down weepinbell.")
+                           (>!! done-chan true)))))
     ;; block til signal received
-    (<!! done-chan)))
+      (<!! done-chan))))
 
diff --git a/test/weepinbell/core_test.clj b/test/weepinbell/core_test.clj
index 9a223c9..1e7cb8a 100644
--- a/test/weepinbell/core_test.clj
+++ b/test/weepinbell/core_test.clj
@@ -1,9 +1,10 @@
 (ns weepinbell.core-test

   (:require [clojure.test :refer [deftest testing is]]

-            [weepinbell.core :refer [start-system]]))

+            [weepinbell.core :refer [start-system]]

+            [weepinbell.config :refer [load-config]]))

 

 (deftest start-system-test

   (testing "system starts and shuts down normally"

-    (let [shutdown (start-system)]

+    (let [shutdown (start-system (load-config "config.edn"))]

       (is (fn? shutdown))

       (is (true? (shutdown))))))