Allow adding to ns-blacklist vector

Signed-off-by: Kjetil Thuen's avatarKjetil Thuen <kjetil.thuen@nsd.no>
parent 837f3c57
......@@ -102,16 +102,15 @@
(.getSeconds d) "."
(.getMilliseconds d)))
:default (force timestamp_))]
(cond->
(str ts
(when (:x-request-id context)
(str " ["
((or (:x-request-formatter config) str) (:x-request-id context))
"]"))
" "
((or (:level-formatter config) str) (str/upper-case (name level)))
" "
(force msg_))
(cond-> (str ts
(when (:x-request-id context)
(str " ["
((or (:x-request-formatter config) str) (:x-request-id context))
"]"))
" "
((or (:level-formatter config) str) (str/upper-case (name level)))
" "
(force msg_))
?err
(str " "(timbre/stacktrace ?err)))))
......@@ -128,7 +127,8 @@
:timezone :jvm-default})
:level (or (:level current-conf)
(if elk? :info :debug))
:ns-blacklist ["org.apache.http.wire"]
:ns-blacklist (vec (conj (set (or (:ns-blacklist current-conf) []))
"org.apache.http.wire"))
:output-fn (if elk?
(partial nsd-logstash-format-fn current-conf)
(or (:output-fn current-conf)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment