Merge tag '2.8.3' into develop

2.8.3
fulcrologic · Feb 22, 2019 · f1305e7 · f1305e7
2 parents 90d9842 + 1e21a7e
commit f1305e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject fulcrologic/fulcro "2.8.2"
+(defproject fulcrologic/fulcro "2.8.3"
   :description "A library for building full-stack SPA webapps in Clojure and Clojurescript"
   :url "https://github.com/fulcrologic/fulcro"
   :lein-min-version "2.8.1"

diff --git a/src/main/fulcro/logging.cljc b/src/main/fulcro/logging.cljc
@@ -22,7 +22,7 @@
 (defn should-log?
   "Returns true if the current logging level indicates that the message level is of interest."
   [current-logging-level message-level]
-  (let [c current-logging-level
+  (let [c (or current-logging-level 4)
         m (get logging-priority message-level 4)]
     (<= m c)))
 

diff --git a/src/test/fulcro/logging_spec.cljc b/src/test/fulcro/logging_spec.cljc
@@ -6,19 +6,19 @@
 (specification "should-log?"
   (assertions
     "Correctly indicates when to log"
-    (log/should-log? :debug :debug) => true
-    (log/should-log? :debug :error) => true
-    (log/should-log? :debug :info) => true
-    (log/should-log? :debug :error) => true
-    (log/should-log? :debug :info) => true
-    (log/should-log? :error :debug) => false
-    (log/should-log? :info :debug) => false
-    (log/should-log? :error :debug) => false
-    (log/should-log? :info :debug) => false
+    (log/should-log? (log/logging-priority :debug) :debug) => true
+    (log/should-log? (log/logging-priority :debug) :error) => true
+    (log/should-log? (log/logging-priority :debug) :info) => true
+    (log/should-log? (log/logging-priority :debug) :error) => true
+    (log/should-log? (log/logging-priority :debug) :info) => true
+    (log/should-log? (log/logging-priority :error) :debug) => false
+    (log/should-log? (log/logging-priority :info) :debug) => false
+    (log/should-log? (log/logging-priority :error) :debug) => false
+    (log/should-log? (log/logging-priority :info) :debug) => false
     "treats an unknown logging level as :info"
-    (log/should-log? :unknown :error) => true
-    (log/should-log? :unknown :info) => true
-    (log/should-log? :unknown :debug) => false))
+    (log/should-log? (log/logging-priority :unknown) :error) => true
+    (log/should-log? (log/logging-priority :unknown) :info) => true
+    (log/should-log? (log/logging-priority :unknown) :debug) => false))
 
 (specification "The logging macro"
   (behavior "emits code to call the internal language-specific logger."