Skip to content

Commit 9832b4e

Browse files
committed
rewrite json-output and minor fixes
1 parent 5085ab5 commit 9832b4e

File tree

1 file changed

+6
-7
lines changed
  • clojure/wheel/src/wheel/infra

1 file changed

+6
-7
lines changed

clojure/wheel/src/wheel/infra/log.clj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
[clojure.spec.alpha :as s]
55
[wheel.middleware.event :as event]))
66

7-
(defn- json-output [{:keys [level msg_ instant]}]
7+
(defn- json-output [{:keys [msg_]}]
88
(let [event (read-string (force msg_))]
9-
(json/generate-string {:timestamp instant
10-
:level level
11-
:event event})))
9+
(json/generate-string event)))
10+
1211
(defn init []
1312
(timbre/merge-config! {:output-fn json-output}))
1413

@@ -31,15 +30,15 @@
3130
(init)
3231
(timbre/info {:name :ranging/succeeded})
3332
(s/check-asserts true)
34-
(write-all! [{:level :info :name :foo}])
33+
(write! {:level :info :name :foo})
3534
(s/check-asserts false)
3635
(s/assert ::event/event {:level :info :name :foo})
3736
(write! {:name :ranging/succeeded
3837
:type :domain
3938
:level :info
4039
:channel-id 1
40+
:timestamp "2019-10-01T21:56+05:30"
4141
:id #uuid "8e70f4df-fc3d-4474-8ee9-33f4c87bf934"
4242
:parent-id #uuid "20c84be2-7ec2-4127-8d39-a9cb4065a9ce"
43-
:channel-name :tata-cliq
44-
:payload {}})
43+
:channel-name :tata-cliq})
4544
)

0 commit comments

Comments
 (0)