[pulsar] branch branch-2.11 updated: Revert "Enable Log4j2 async loggers (#15188)" (#17474)

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new 6b625c29e06 Revert "Enable Log4j2 async loggers (#15188)" (#17474)
6b625c29e06 is described below

commit 6b625c29e06c173d6b449bffa969c1d312ef3146
Author: Christophe Bornet <cbor...@hotmail.com>
AuthorDate: Mon Sep 5 16:18:26 2022 +0200

    Revert "Enable Log4j2 async loggers (#15188)" (#17474)
    
    This reverts commit 1e9a1f087e8c6fd9e78f6e3f0635113ba7927bbf.
    
    (cherry picked from commit 35d3d5cb859c77c468a7a15c1497ee089365d83b)
---
 bin/pulsar                                       | 5 +----
 conf/log4j2.yaml                                 | 1 -
 distribution/server/pom.xml                      | 5 -----
 distribution/server/src/assemble/LICENSE.bin.txt | 2 --
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/bin/pulsar b/bin/pulsar
index 205659f8d18..0658762c96b 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -316,11 +316,8 @@ OPTS="$OPTS -Dpulsar.log.dir=$PULSAR_LOG_DIR"
 OPTS="$OPTS -Dpulsar.log.level=$PULSAR_LOG_LEVEL"
 OPTS="$OPTS -Dpulsar.log.root.level=$PULSAR_LOG_ROOT_LEVEL"
 OPTS="$OPTS -Dpulsar.routing.appender.default=$PULSAR_ROUTING_APPENDER_DEFAULT"
-
-
 # Configure log4j2 to disable servlet webapp detection so that Garbage free 
logging can be used
-PULSAR_LOG4J_CONF=${PULSAR_LOG4J_CONF:-"-Dlog4j2.is.webapp=false  
-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
 -Dlog4j2.enableThreadlocals=true -Dlog4j2.enableDirectEncoders=true"}
-OPTS="$OPTS $PULSAR_LOG4J_CONF"
+OPTS="$OPTS -Dlog4j2.is.webapp=false"
 
 # Functions related logging
 OPTS="$OPTS -Dpulsar.functions.process.container.log.dir=$PULSAR_LOG_DIR"
diff --git a/conf/log4j2.yaml b/conf/log4j2.yaml
index 177c6adc44a..71698d72067 100644
--- a/conf/log4j2.yaml
+++ b/conf/log4j2.yaml
@@ -53,7 +53,6 @@ Configuration:
     Console:
       name: Console
       target: SYSTEM_OUT
-      direct: true
       PatternLayout:
         Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} 
- %msg%n"
 
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 52959729307..d30eae88907 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -64,11 +64,6 @@
       <version>${jline.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.lmax</groupId>
-      <artifactId>disruptor</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-prometheus-metrics</artifactId>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt 
b/distribution/server/src/assemble/LICENSE.bin.txt
index 261607eadd4..bdebbe84cde 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -543,8 +543,6 @@ The Apache Software License, Version 2.0
     - io.etcd-jetcd-core-0.5.11.jar
   * IPAddress
     - com.github.seancfoley-ipaddress-5.3.3.jar
-  * LMAX Disruptor
-    - com.lmax-disruptor-3.4.3.jar
   * RxJava
     - io.reactivex.rxjava3-rxjava-3.0.1.jar
   * RabbitMQ Java Client