The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Replace amalloy/ring-buffer dependency with already included CircularFifoQueue (#66007)
Oleksandr Yakushevb2840f32f99a
diff --git a/deps.edn b/deps.ednindex 5051ff128db..7447f012a3b 100644--- a/deps.edn+++ b/deps.edn@@ -4,10 +4,7 @@;; !! PLEASE KEEP THESE ORGANIZED ALPHABETICALLY !!;; !! AND ADD A COMMENT EXPLAINING THEIR PURPOSE !!;; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!- {amalloy/ring-buffer {:mvn/version "1.3.1" ; fixed length queue implementation, used in log buffering- :exclusions [org.clojure/clojure- org.clojure/clojurescript]}- amalloy/ring-gzip-middleware {:mvn/version "0.1.4"} ; Ring middleware to GZIP responses if client can handle it+ {amalloy/ring-gzip-middleware {:mvn/version "0.1.4"} ; Ring middleware to GZIP responses if client can handle itbabashka/fs {:mvn/version "0.5.27"} ; Portable filesystem operationsbigml/histogram {:mvn/version "5.0.0" ; Histogram data structure:exclusions [junit/junit]}diff --git a/src/metabase/logger/core.clj b/src/metabase/logger/core.cljindex 2e0eaa4153e..d3661f0a480 100644--- a/src/metabase/logger/core.clj+++ b/src/metabase/logger/core.clj@@ -3,7 +3,6 @@logging options are set in [[metabase.core.bootstrap]]: the context locator for log4j2 and ensuring log4j2 is thelogger that clojure.tools.logging uses."(:require- [amalloy.ring-buffer :refer [ring-buffer]]^{:clj-kondo/ignore [:discouraged-namespace]}[clojure.tools.logging :as log][clojure.tools.logging.impl :as log.impl]@@ -13,6 +12,9 @@[metabase.config.core :as config])(:import(java.lang AutoCloseable)+ (java.util Queue)+ (org.apache.commons.collections4 QueueUtils)+ (org.apache.commons.collections4.queue CircularFifoQueue)(org.apache.commons.lang3.exception ExceptionUtils)(org.apache.logging.log4j LogManager Level)(org.apache.logging.log4j.core Appender LogEvent Logger LoggerContext)@@ -23,12 +25,13 @@(def ^:private ^:const max-log-entries 250)-(defonce ^:private messages* (atom (ring-buffer max-log-entries)))+(defonce ^:private ^Queue messages* (QueueUtils/synchronizedQueue (CircularFifoQueue. (int max-log-entries))))(defn messages"Get the list of currently buffered log entries, from most-recent to oldest."[]- (reverse (seq @messages*)))+ (locking messages*+ (rseq (vec messages*))))(defn- elide-string"Elides the string to the specified length, adding '...' if it exceeds that length."@@ -53,7 +56,7 @@(proxy [org.apache.logging.log4j.core.appender.AbstractAppender]["metabase-appender" filter layout false properties](append [event]- (swap! messages* conj (event->log-data event))+ (.add messages* (event->log-data event))nil))))(defonce ^:private has-added-appender? (atom false))