diff --git a/README.md b/README.md index daac770..5ac7c2f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Clojure's [threading macros](https://clojure.org/guides/threading_macros) (the ` Place the following in the `:deps` map of your `deps.edn` file: ```clojure ... - net.clojars.john/injest {:mvn/version "0.1.0-beta.5"} + net.clojars.john/injest {:mvn/version "0.1.0-beta.6"} ... ``` ### clj-kondo @@ -30,7 +30,7 @@ To try it in a repl right now with `criterium` and `net.cgrand.xforms`, drop thi ```clojure clj -Sdeps \ '{:deps - {net.clojars.john/injest {:mvn/version "0.1.0-beta.5"} + {net.clojars.john/injest {:mvn/version "0.1.0-beta.6"} criterium/criterium {:mvn/version "0.4.6"} net.cgrand/xforms {:mvn/version "0.19.2"}}}' ``` diff --git a/build.clj b/build.clj index 33784b5..adf905d 100644 --- a/build.clj +++ b/build.clj @@ -3,7 +3,7 @@ (:require [org.corfield.build :as bb])) (def lib 'net.clojars.john/injest) -(def version "0.1.0-beta.5") +(def version "0.1.0-beta.6") ;; clojure -T:build ci ;; clojure -T:build deploy diff --git a/src/injest/report.cljc b/src/injest/report.cljc index 45aaca7..632c467 100644 --- a/src/injest/report.cljc +++ b/src/injest/report.cljc @@ -6,11 +6,9 @@ (def report-live? (atom false)) (def report-taps (atom {})) -(defn flc [form-meta] - (let [f #?(:clj *file* :cljs (namespace ::x)) - {:as m :keys [line column]} form-meta - k (str f "?line=" line "&col=" column)] - k)) +(defn flc [f form-meta] + (let [{:as m :keys [line column]} form-meta] + (str f "?line=" line "&col=" column))) (defn now [] #?(:clj (.toEpochMilli (java.time.Instant/now)) diff --git a/src/injest/report/path.cljc b/src/injest/report/path.cljc index f6f9b1a..3a7492f 100644 --- a/src/injest/report/path.cljc +++ b/src/injest/report/path.cljc @@ -33,7 +33,7 @@ `(if-not @r/report-live? (injest.path/x>> ~x ~@thread) (let [a?# (= 0 (rand-int 2)) - k# (r/flc ~(meta &form))] + k# (r/flc ~(namespace ::x) ~(meta &form))] (if a?# (r/monitor k# injest.path/x>> ~(concat [x] thread)) (r/monitor k# injest.path/+>> ~(concat [x] thread)))))) @@ -48,7 +48,7 @@ `(if-not @r/report-live? (injest.path/x>> ~x ~@thread) (let [n# (rand-int 3) - k# (r/flc ~(meta &form))] + k# (r/flc ~(namespace ::x) ~(meta &form))] (case n# 0 (r/monitor k# injest.path/=>> ~(concat [x] thread)) 1 (r/monitor k# injest.path/x>> ~(concat [x] thread))