Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ README-PRIVATE.rst
.shadow-cljs/
node_modules/
deploy/
logs/dativebase.log
.clj-kondo/
6 changes: 3 additions & 3 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
clj-http/clj-http {:mvn/version "3.12.3"}
clojure.java-time/clojure.java-time {:mvn/version "1.3.0"}
com.layerware/hugsql {:mvn/version "0.5.3"}
com.fzakaria/slf4j-timbre {:mvn/version "0.3.21"}
com.stuartsierra/component {:mvn/version "1.1.0"}
com.stuartsierra/component.repl {:mvn/version "0.2.0"}
com.taoensso/timbre {:mvn/version "6.1.0"}
com.taoensso/telemere {:mvn/version "1.0.0-RC5"}
com.taoensso/telemere-slf4j {:mvn/version "1.0.0-RC5"}
hikari-cp/hikari-cp {:mvn/version "3.0.1" :exclusions [org.slf4j/slf4j-api]}
metosin/reitit {:mvn/version "0.6.0"
:exclusions [com.fasterxml.jackson.core/jackson-core
Expand All @@ -18,7 +18,7 @@
org.clojure/java.jdbc {:mvn/version "0.7.12"}
org.mindrot/jbcrypt {:mvn/version "0.4"}
org.postgresql/postgresql {:mvn/version "42.6.0"}
org.slf4j/slf4j-api {:mvn/version "1.7.36"}
org.slf4j/slf4j-api {:mvn/version "2.0.13"}
org.xerial/sqlite-jdbc {:mvn/version "3.41.0.0"}
com.novemberain/pantomime {:mvn/version "2.11.0"}
ring/ring-core {:mvn/version "1.9.6"}
Expand Down
23 changes: 19 additions & 4 deletions src/dvb/server/log.clj
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
(ns dvb.server.log
(:require [dvb.server.scrub :as scrub]
[taoensso.timbre :as log]))
[taoensso.telemere :as tel]))

(defmacro info [& args]
`(log/info ~@(for [a args] (if (coll? a) (scrub/scrub a) a))))
`(tel/log! {:level :info
:msg ~(vec
(for [a args]
(if (coll? a)
(scrub/scrub a)
a)))}))

(defmacro warn [& args]
`(log/warn ~@(for [a args] (if (coll? a) (scrub/scrub a) a))))
`(tel/log! {:level :warn
:msg ~(vec
(for [a args]
(if (coll? a)
(scrub/scrub a)
a)))}))

(defmacro error [& args]
`(log/error ~@(for [a args] (if (coll? a) (scrub/scrub a) a))))
`(tel/log! {:level :error
:msg ~(vec
(for [a args]
(if (coll? a)
(scrub/scrub a)
a)))}))
23 changes: 17 additions & 6 deletions src/dvb/server/system/log.clj
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
(ns dvb.server.system.log
(:require [taoensso.timbre :as timbre]
[taoensso.timbre.appenders.core :as appenders]))
(:require
[taoensso.telemere :as tel]))

(defn init [log-file-path]
(timbre/merge-config!
{:min-level :info
:appenders {:spit (appenders/spit-appender {:fname log-file-path})}}))
(defn init
"Initialize logging: set level to INFO and write all logs to `log-file-path`."
[log-file-path]
(tel/set-min-level! :log :info)
(tel/add-handler!
:file
(tel/handler:file {:path log-file-path
;; output-fn (utils/format-signal-fn)
;; :interval :monthly
;; :max-file-size (* 1024 1024 4)
;; :max-num-parts 8
;; :max-num-intervals 6
;; :gzip-archives? true
}))
nil)