diff --git a/src/taoensso/telemere.cljc b/src/taoensso/telemere.cljc index 8415ff3..de7992f 100644 --- a/src/taoensso/telemere.cljc +++ b/src/taoensso/telemere.cljc @@ -11,9 +11,10 @@ [taoensso.encore.signals :as sigs] [taoensso.telemere.impl :as impl] [taoensso.telemere.utils :as utils] - [taoensso.telemere.console-handlers :as console-handlers] - #?(:clj [taoensso.telemere.file-handler :as file-handler]) - #?(:clj [taoensso.telemere.streams :as streams])) + #?(:clj [taoensso.telemere.streams :as streams]) + + #?(:default [taoensso.telemere.handlers.console :as handlers:console]) + #?(:clj [taoensso.telemere.handlers.file :as handlers:file])) #?(:cljs (:require-macros @@ -383,9 +384,9 @@ "See docstring") (enc/defaliases - #?(:default console-handlers/handler:console) - #?(:cljs console-handlers/handler:console-raw) - #?(:clj file-handler/handler:file)) + #?(:default handlers:console/handler:console) + #?(:cljs handlers:console/handler:console-raw) + #?(:clj handlers:file/handler:file)) (defonce ^:no-doc __add-default-handlers (do diff --git a/src/taoensso/telemere/console_handlers.cljc b/src/taoensso/telemere/handlers/console.cljc similarity index 96% rename from src/taoensso/telemere/console_handlers.cljc rename to src/taoensso/telemere/handlers/console.cljc index e1e7c6a..5a1fa43 100644 --- a/src/taoensso/telemere/console_handlers.cljc +++ b/src/taoensso/telemere/handlers/console.cljc @@ -1,11 +1,12 @@ -(ns ^:no-doc taoensso.telemere.console-handlers - "Private ns, implementation detail." +(ns ^:no-doc taoensso.telemere.handlers.console + "Private ns, implementation detail. + Core console handlers." (:require [taoensso.encore :as enc :refer [have have?]] [taoensso.telemere.utils :as utils])) (comment - (remove-ns 'taoensso.telemere.console-handlers) + (remove-ns 'taoensso.telemere.handlers.console) (:api (enc/interns-overview))) #?(:clj diff --git a/src/taoensso/telemere/file_handler.clj b/src/taoensso/telemere/handlers/file.clj similarity index 99% rename from src/taoensso/telemere/file_handler.clj rename to src/taoensso/telemere/handlers/file.clj index 29c8401..25995c3 100644 --- a/src/taoensso/telemere/file_handler.clj +++ b/src/taoensso/telemere/handlers/file.clj @@ -1,11 +1,12 @@ -(ns ^:no-doc taoensso.telemere.file-handler - "Private ns, implementation detail." +(ns ^:no-doc taoensso.telemere.handlers.file + "Private ns, implementation detail. + Core archiving file handler." (:require [taoensso.encore :as enc :refer [have have?]] [taoensso.telemere.utils :as utils])) (comment - (remove-ns 'taoensso.telemere.file-handler) + (remove-ns 'taoensso.telemere.handlers.file) (:api (enc/interns-overview))) ;;;; Implementation diff --git a/test/taoensso/telemere_tests.cljc b/test/taoensso/telemere_tests.cljc index 0e20539..16fc958 100644 --- a/test/taoensso/telemere_tests.cljc +++ b/test/taoensso/telemere_tests.cljc @@ -13,8 +13,8 @@ #?(:clj [taoensso.telemere.slf4j :as slf4j]) #?(:clj [clojure.tools.logging :as ctl]) - #?(:default [taoensso.telemere.console-handlers :as ch]) - #?(:clj [taoensso.telemere.file-handler :as fh]))) + #?(:default [taoensso.telemere.handlers.console :as handlers:console]) + #?(:clj [taoensso.telemere.handlers.file :as handlers:file]))) (comment (remove-ns 'taoensso.telemere-tests) @@ -691,6 +691,8 @@ ;;;; File handler +#?(:clj (alias 'fh 'taoensso.telemere.handlers.file)) + #?(:clj (deftest _file-names [(is (= (fh/get-file-name "/logs/app.log" nil nil false) "/logs/app.log")) @@ -790,9 +792,9 @@ (deftest _other-handlers ;; For now just testing that basic construction succeeds - [#?(:default (is (fn? (ch/handler:console)))) - #?(:cljs (is (fn? (ch/handler:console-raw)))) - #?(:clj (is (fn? (fh/handler:file))))]) + [#?(:default (is (fn? (handlers:console/handler:console)))) + #?(:cljs (is (fn? (handlers:console/handler:console-raw)))) + #?(:clj (is (fn? (handlers:file/handler:file))))]) ;;;;