Skip to content

Commit

Permalink
Move hf.dev.logger to triage
Browse files Browse the repository at this point in the history
  • Loading branch information
ggeoffrey authored and dustingetz committed May 11, 2022
1 parent aa95254 commit 5e6f291
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions shadow-cljs.edn
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
:ns-regexp "^hyperfiddle.photon-[^dom].*$"
:build-options {:cache-level :off}
:modules {:main {:entries [hyperfiddle.photon hyperfiddle.photon-test]}}
:dev {:closure-defines {hyperfiddle.dev.logger/LEVEL "debug"}}
:dev {:closure-defines {triage.logger/LEVEL "debug"}}
:compiler-options {:warnings {:redef-in-file false}}}
:browser-test {:target :karma
:output-to "out/karma-tests.js"
:ns-regexp "^hyperfiddle.photon-.*$"
:build-options {:cache-level :off}
:modules {:main {:entries [hyperfiddle.photon hyperfiddle.photon-test]}}
:dev {:closure-defines {hyperfiddle.dev.logger/LEVEL "debug"}}
:dev {:closure-defines {triage.logger/LEVEL "debug"}}
:compiler-options {:warnings {:redef-in-file false}}}}}
2 changes: 1 addition & 1 deletion src-dev/dev.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[datahike.api :as d]
[datahike.core :as dc]
[hyperfiddle.api :as hf]
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[hyperfiddle.rcf :refer [tests % !]]))


Expand Down
2 changes: 1 addition & 1 deletion src-dev/user.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
(require 'io.pedestal.http)
(io.pedestal.http/stop server)
; use logger when debugging due to concurrency which will interleave printlns
#_(hyperfiddle.dev.logger/set-level! :debug)
#_(triage.logger/set-level! :debug)
)

(comment
Expand Down
2 changes: 1 addition & 1 deletion src-docs/user/entrypoint.cljs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns user.entrypoint
(:require [hyperfiddle.dev.logger :as log]
(:require [triage.logger :as log]
user.hytradboi
user.orders-ui))

Expand Down
4 changes: 2 additions & 2 deletions src/hyperfiddle/api.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[hyperfiddle.photon :as p :refer [vars]]
[missionary.core :as m]
[hyperfiddle.hfql :as hfql]
#?(:clj [hyperfiddle.dev.logger :as log]))
#?(:cljs (:require [hyperfiddle.dev.logger :as log]))
#?(:clj [triage.logger :as log]))
#?(:cljs (:require [triage.logger :as log]))
#?(:cljs (:require-macros [hyperfiddle.api :refer [route db entity attribute value context refs props sequenceM render join-all data tx
hfql]])))

Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/client.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns hyperfiddle.client
(:require [triage.transit :as transit]
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[missionary.core :as m]
["reconnecting-websocket" :as ReconnectingWebSocket]
hyperfiddle.ui ; hot-reload p/defs on save
Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/photon_impl/runtime.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(:require [hyperfiddle.photon-impl.yield :refer [yield]]
[hyperfiddle.photon-impl.local :as l]
[missionary.core :as m]
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[hyperfiddle.rcf :refer [tests]])
(:import missionary.Cancelled
#?(:clj (clojure.lang IFn IDeref))))
Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/server.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[io.pedestal.http.secure-headers :as secure-headers]
[io.pedestal.interceptor.helpers :refer [before]]
[ring.middleware.file :as file]
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[missionary.core :as m]
[hyperfiddle.photon :as p])
(:import org.eclipse.jetty.server.handler.gzip.GzipHandler
Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/server/interceptors.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[clojure.string :as str]
[io.pedestal.http.content-negotiation :as content-negotiation]
[io.pedestal.interceptor.helpers :as interceptor]
[hyperfiddle.dev.logger :as log])
[triage.logger :as log])
(:import [java.io OutputStreamWriter]
java.util.UUID
org.apache.commons.lang3.StringEscapeUtils))
Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/server/websockets.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns hyperfiddle.server.websockets
(:require
[missionary.core :as m]
[hyperfiddle.dev.logger :as log])
[triage.logger :as log])
(:import (org.eclipse.jetty.servlet ServletContextHandler ServletHolder)
(org.eclipse.jetty.websocket.api RemoteEndpoint Session WebSocketConnectionListener
WebSocketListener WriteCallback SuspendToken)
Expand Down
2 changes: 1 addition & 1 deletion src/hyperfiddle/ui.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[missionary.core :as m]
[datascript.db]
#?(:clj [datahike.api :as d])
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[hyperfiddle.ui.color :refer [color]])
#?(:cljs (:require-macros [hyperfiddle.ui :refer [link]])))

Expand Down
6 changes: 3 additions & 3 deletions src/hyperfiddle/ui/codemirror.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[missionary.core :as m]
[clojure.edn :as edn]
[clojure.pprint :as pprint]
[hyperfiddle.dev.logger :as log])
[triage.logger :as log])
:cljs (:require
[clojure.edn :as edn]
[clojure.pprint :as pprint]
[hyperfiddle.dev.logger :as log]
[triage.logger :as log]
[hyperfiddle.photon :as p]
hyperfiddle.photon-dom
[hyperfiddle.photon-xp :as xp]
Expand Down Expand Up @@ -101,7 +101,7 @@
(defn read-edn [edn-str]
(try (edn/read-string edn-str)
(catch #?(:clj Throwable :cljs :default) t
(hyperfiddle.dev.logger/error t)
(triage.logger/error t)
nil)))

(defn write-edn [edn] (with-out-str (pprint/pprint edn)))
Expand Down
4 changes: 2 additions & 2 deletions src/hyperfiddle/dev/logger.cljc → src/triage/logger.cljc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns hyperfiddle.dev.logger
(ns triage.logger ;; TODO Triage. HF library should probably not ship with a logger.
#?(:clj (:require [clojure.tools.logging :as log]
[clojure.tools.logging.impl :as impl])
:cljs (:require-macros [hyperfiddle.dev.logger :refer [log debug info trace warn error]])))
:cljs (:require-macros [triage.logger :refer [log debug info trace warn error]])))

(def levels [:trace :debug :info :warn :error])

Expand Down

0 comments on commit 5e6f291

Please sign in to comment.