diff --git a/README.md b/README.md index f7951f14..05e6fdee 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ See also `car-appender/query-entries`. ### Community appenders -A number of community appenders are included out-the-box [here](https://github.com/ptaoussanis/timbre/tree/master/community/src). These include appenders for Android, Logstash, Slack, Sentry, NodeJS, Syslog, PostgreSQL, etc. +A number of community appenders are included out-the-box [here](https://github.com/ptaoussanis/timbre/tree/master/src/taoensso/timbre/appenders/community). These include appenders for Android, Logstash, Slack, Sentry, NodeJS, Syslog, PostgreSQL, etc. Thanks goes to the respective authors! **Please see the relevant namespace docstring for details**. diff --git a/extra/README.md b/extra/README.md new file mode 100644 index 00000000..8d037a8c --- /dev/null +++ b/extra/README.md @@ -0,0 +1,5 @@ +This dir contains community code that requires a specific platform and/or environment. + +The code **should not** be included in the default Leiningen profile since it would cause problems for most users when running tests, generating docs, etc. + +The code **should** be included when generating final jar build for deployment to Clojars, etc. diff --git a/community/src/android_logcat.clj b/extra/src/taoensso/timbre/appenders/community/android_logcat.clj similarity index 100% rename from community/src/android_logcat.clj rename to extra/src/taoensso/timbre/appenders/community/android_logcat.clj diff --git a/community/src/newrelic.clj b/extra/src/taoensso/timbre/appenders/community/newrelic.clj similarity index 100% rename from community/src/newrelic.clj rename to extra/src/taoensso/timbre/appenders/community/newrelic.clj diff --git a/community/src/zmq.clj b/extra/src/taoensso/timbre/appenders/community/zmq.clj similarity index 100% rename from community/src/zmq.clj rename to extra/src/taoensso/timbre/appenders/community/zmq.clj diff --git a/extra/test/taoensso/timbre/appenders/community/empty b/extra/test/taoensso/timbre/appenders/community/empty new file mode 100644 index 00000000..c6cac692 --- /dev/null +++ b/extra/test/taoensso/timbre/appenders/community/empty @@ -0,0 +1 @@ +empty diff --git a/project.clj b/project.clj index 6c7aef8a..c45ace8a 100644 --- a/project.clj +++ b/project.clj @@ -32,12 +32,10 @@ :c1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]} :depr {:jvm-opts ["-Dtaoensso.elide-deprecated=true"]} - :dev [:c1.11 :test :server-jvm #_:depr #_:community] ; TODO :depr + :dev [:c1.11 :test :server-jvm #_:depr :community #_:extra] ; TODO :depr :community - {:source-paths [ "src" "community/src"] - :test-paths ["test" "src" "community/test" "community/src"] - :dependencies + {:dependencies [[irclj "0.5.0-alpha4"] [org.graylog2/gelfclient "1.5.1" :exclusions [com.fasterxml.jackson.core/jackson-core]] @@ -55,6 +53,10 @@ [cljs-node-io "1.1.2"] ; Node spit appender ]} + :extra + {:source-paths [ "src" "extra/src"] + :test-paths ["test" #_"src" "extra/test" #_"extra/src"]} + :test {:dependencies [[org.clojure/test.check "1.1.1"] @@ -84,7 +86,9 @@ :aliases {"start-dev" ["with-profile" "+dev" "repl" ":headless"] - "deploy-lib" ["do" ["build-once"] ["deploy" "clojars"] ["install"]] + ;; "deploy-lib" ["do" ["build-once"] ["deploy" "clojars"] ["install"]] + "deploy-lib" ["with-profile" "+extra" + "do" ["build-once"] ["deploy" "clojars"] ["install"]] "build-once" ["do" ["clean"] "cljsbuild" "once"] "test-cljs" ["with-profile" "+test" "cljsbuild" "test"] diff --git a/src/taoensso/timbre/appenders/community/android_logcat._clj b/src/taoensso/timbre/appenders/community/android_logcat._clj new file mode 120000 index 00000000..1626c2d9 --- /dev/null +++ b/src/taoensso/timbre/appenders/community/android_logcat._clj @@ -0,0 +1 @@ +../../../../../extra/src/taoensso/timbre/appenders/community/android_logcat.clj \ No newline at end of file diff --git a/community/src/congomongo.clj b/src/taoensso/timbre/appenders/community/congomongo.clj similarity index 100% rename from community/src/congomongo.clj rename to src/taoensso/timbre/appenders/community/congomongo.clj diff --git a/community/src/franzy.clj b/src/taoensso/timbre/appenders/community/franzy.clj similarity index 100% rename from community/src/franzy.clj rename to src/taoensso/timbre/appenders/community/franzy.clj diff --git a/community/src/gelf.clj b/src/taoensso/timbre/appenders/community/gelf.clj similarity index 100% rename from community/src/gelf.clj rename to src/taoensso/timbre/appenders/community/gelf.clj diff --git a/community/src/irclj.clj b/src/taoensso/timbre/appenders/community/irclj.clj similarity index 100% rename from community/src/irclj.clj rename to src/taoensso/timbre/appenders/community/irclj.clj diff --git a/community/src/logstash.clj b/src/taoensso/timbre/appenders/community/logstash.clj similarity index 100% rename from community/src/logstash.clj rename to src/taoensso/timbre/appenders/community/logstash.clj diff --git a/src/taoensso/timbre/appenders/community/new_relic._clj b/src/taoensso/timbre/appenders/community/new_relic._clj new file mode 120000 index 00000000..3997d4d3 --- /dev/null +++ b/src/taoensso/timbre/appenders/community/new_relic._clj @@ -0,0 +1 @@ +../../../../../extra/src/taoensso/timbre/appenders/community/newrelic.clj \ No newline at end of file diff --git a/community/src/node_spit.cljs b/src/taoensso/timbre/appenders/community/node_spit.cljs similarity index 100% rename from community/src/node_spit.cljs rename to src/taoensso/timbre/appenders/community/node_spit.cljs diff --git a/community/src/postgresql.clj b/src/taoensso/timbre/appenders/community/postgresql.clj similarity index 100% rename from community/src/postgresql.clj rename to src/taoensso/timbre/appenders/community/postgresql.clj diff --git a/community/src/rolling.clj b/src/taoensso/timbre/appenders/community/rolling.clj similarity index 100% rename from community/src/rolling.clj rename to src/taoensso/timbre/appenders/community/rolling.clj diff --git a/community/src/rotor.clj b/src/taoensso/timbre/appenders/community/rotor.clj similarity index 100% rename from community/src/rotor.clj rename to src/taoensso/timbre/appenders/community/rotor.clj diff --git a/community/src/sentry.clj b/src/taoensso/timbre/appenders/community/sentry.clj similarity index 100% rename from community/src/sentry.clj rename to src/taoensso/timbre/appenders/community/sentry.clj diff --git a/community/src/server_socket.clj b/src/taoensso/timbre/appenders/community/server_socket.clj similarity index 100% rename from community/src/server_socket.clj rename to src/taoensso/timbre/appenders/community/server_socket.clj diff --git a/community/src/slack.clj b/src/taoensso/timbre/appenders/community/slack.clj similarity index 100% rename from community/src/slack.clj rename to src/taoensso/timbre/appenders/community/slack.clj diff --git a/community/src/syslog_appender.clj b/src/taoensso/timbre/appenders/community/syslog_appender.clj similarity index 100% rename from community/src/syslog_appender.clj rename to src/taoensso/timbre/appenders/community/syslog_appender.clj diff --git a/community/src/udp_socket.clj b/src/taoensso/timbre/appenders/community/udp_socket.clj similarity index 100% rename from community/src/udp_socket.clj rename to src/taoensso/timbre/appenders/community/udp_socket.clj diff --git a/src/taoensso/timbre/appenders/community/zmq._clj b/src/taoensso/timbre/appenders/community/zmq._clj new file mode 120000 index 00000000..3ba74106 --- /dev/null +++ b/src/taoensso/timbre/appenders/community/zmq._clj @@ -0,0 +1 @@ +../../../../../extra/src/taoensso/timbre/appenders/community/zmq.clj \ No newline at end of file diff --git a/community/test/taoensso/timbre/appenders/community/rolling_test.clj b/test/taoensso/timbre/appenders/community/rolling_test.clj similarity index 100% rename from community/test/taoensso/timbre/appenders/community/rolling_test.clj rename to test/taoensso/timbre/appenders/community/rolling_test.clj diff --git a/community/test/taoensso/timbre/appenders/community/rotor_test.clj b/test/taoensso/timbre/appenders/community/rotor_test.clj similarity index 100% rename from community/test/taoensso/timbre/appenders/community/rotor_test.clj rename to test/taoensso/timbre/appenders/community/rotor_test.clj