From c5001b93ff1b917dba7d5ec8cfc4b0f7ba67f9ac Mon Sep 17 00:00:00 2001 From: Kenny Williams Date: Fri, 15 Dec 2017 12:17:35 -0800 Subject: [PATCH] Only call .getFileName and .getLineNumber when the caller is not nil. --- src/slf4j_timbre/adapter.clj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/slf4j_timbre/adapter.clj b/src/slf4j_timbre/adapter.clj index f1fb636..1be1488 100644 --- a/src/slf4j_timbre/adapter.clj +++ b/src/slf4j_timbre/adapter.clj @@ -111,15 +111,15 @@ (timbre/with-context (when marker# {:marker (.getName marker#)}) (if t# (timbre/log! ~level-keyword :p - [t# message#] - {:?ns-str (.getName this#) - :?file (.getFileName caller#) - :?line (.getLineNumber caller#)}) + [t# message#] + (cond-> {:?ns-str (.getName this#)} + caller# (assoc :?file (.getFileName caller#) + :?line (.getLineNumber caller#)))) (timbre/log! ~level-keyword :p - [message#] - {:?ns-str (.getName this#) - :?file (.getFileName caller#) - :?line (.getLineNumber caller#)}))))))) + [message#] + (cond-> {:?ns-str (.getName this#)} + caller# (assoc :?file (.getFileName caller#) + :?line (.getLineNumber caller#)))))))))) (define-log-method LocationAwareLogger/ERROR_INT :error) (define-log-method LocationAwareLogger/WARN_INT :warn)