From faf651e9d0cbc816026f972695da9a00eba64a35 Mon Sep 17 00:00:00 2001 From: Aaron Iba Date: Sat, 28 Aug 2021 18:43:31 -0400 Subject: [PATCH 1/2] better formatting of javascript errors --- src/taoensso/timbre.cljc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/taoensso/timbre.cljc b/src/taoensso/timbre.cljc index a8afcebc..31c8fc57 100644 --- a/src/taoensso/timbre.cljc +++ b/src/taoensso/timbre.cljc @@ -896,7 +896,7 @@ (defn stacktrace ([err ] (stacktrace err nil)) ([err opts] - #?(:cljs (or (.-stack err) (str err)) ; TODO Alternatives? + #?(:cljs (str err enc/system-newline (.-stack err)) ; TODO Alternatives? :clj (let [stacktrace-fonts ; {:stacktrace-fonts nil->{}} (if-let [e (find opts :stacktrace-fonts)] From 35c46dd31b003d97c8315cd1b42721335fb389bd Mon Sep 17 00:00:00 2001 From: Aaron Iba Date: Sat, 28 Aug 2021 18:48:53 -0400 Subject: [PATCH 2/2] remove extra newline when no stack exists --- src/taoensso/timbre.cljc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/taoensso/timbre.cljc b/src/taoensso/timbre.cljc index 31c8fc57..9e217303 100644 --- a/src/taoensso/timbre.cljc +++ b/src/taoensso/timbre.cljc @@ -896,7 +896,11 @@ (defn stacktrace ([err ] (stacktrace err nil)) ([err opts] - #?(:cljs (str err enc/system-newline (.-stack err)) ; TODO Alternatives? + #?(:cljs + ;; TODO Alternatives? + (str err + (when-let [s (.-stack err)] + (str enc/system-newline s))) :clj (let [stacktrace-fonts ; {:stacktrace-fonts nil->{}} (if-let [e (find opts :stacktrace-fonts)]