You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rs...@apache.org on 2018/02/20 21:00:42 UTC
[kafka] branch 1.1 updated: MINOR: Fix logger name override (#4600)
This is an automated email from the ASF dual-hosted git repository.
rsivaram pushed a commit to branch 1.1
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/1.1 by this push:
new 1f871e5 MINOR: Fix logger name override (#4600)
1f871e5 is described below
commit 1f871e56935ea44ebcd0e606cd04603146b3ef63
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Tue Feb 20 12:42:05 2018 -0800
MINOR: Fix logger name override (#4600)
This regressed during the log4j -> scalalogging change.
Added unit tests, one of which failed before the fix.
---
.../controller/ControllerChannelManager.scala | 1 -
core/src/main/scala/kafka/log/LogCleaner.scala | 7 +++----
.../main/scala/kafka/log/LogCleanerManager.scala | 2 +-
.../main/scala/kafka/server/MetadataCache.scala | 2 +-
core/src/main/scala/kafka/utils/Logging.scala | 11 ++++++----
.../DelegationTokenEndToEndAuthorizationTest.scala | 2 +-
.../SaslScramSslEndToEndAuthorizationTest.scala | 3 +--
...ltipleListenersWithDefaultJaasContextTest.scala | 2 --
core/src/test/scala/kafka/utils/LoggingTest.scala | 24 ++++++++++++++++++++++
9 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
index d5456be..7f0b8a4 100755
--- a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
+++ b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
@@ -36,7 +36,6 @@ import org.apache.kafka.common.security.JaasContext
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.utils.{LogContext, Time}
import org.apache.kafka.common.{Node, TopicPartition}
-import org.slf4j.event.Level
import scala.collection.JavaConverters._
import scala.collection.mutable.HashMap
diff --git a/core/src/main/scala/kafka/log/LogCleaner.scala b/core/src/main/scala/kafka/log/LogCleaner.scala
index 063f443..658b853 100644
--- a/core/src/main/scala/kafka/log/LogCleaner.scala
+++ b/core/src/main/scala/kafka/log/LogCleaner.scala
@@ -20,7 +20,6 @@ package kafka.log
import java.io.{File, IOException}
import java.nio._
import java.nio.file.Files
-import java.util
import java.util.Date
import java.util.concurrent.TimeUnit
@@ -262,9 +261,9 @@ class LogCleaner(initialConfig: CleanerConfig,
private class CleanerThread(threadId: Int)
extends ShutdownableThread(name = "kafka-log-cleaner-thread-" + threadId, isInterruptible = false) {
- override val loggerName = classOf[LogCleaner].getName
+ protected override def loggerName = classOf[LogCleaner].getName
- if(config.dedupeBufferSize / config.numThreads > Int.MaxValue)
+ if (config.dedupeBufferSize / config.numThreads > Int.MaxValue)
warn("Cannot use more than 2G of cleaner buffer space per cleaner thread, ignoring excess buffer space...")
val cleaner = new Cleaner(id = threadId,
@@ -406,7 +405,7 @@ private[log] class Cleaner(val id: Int,
time: Time,
checkDone: (TopicPartition) => Unit) extends Logging {
- override val loggerName = classOf[LogCleaner].getName
+ protected override def loggerName = classOf[LogCleaner].getName
this.logIdent = "Cleaner " + id + ": "
diff --git a/core/src/main/scala/kafka/log/LogCleanerManager.scala b/core/src/main/scala/kafka/log/LogCleanerManager.scala
index b23107b..9beaf8b 100755
--- a/core/src/main/scala/kafka/log/LogCleanerManager.scala
+++ b/core/src/main/scala/kafka/log/LogCleanerManager.scala
@@ -53,7 +53,7 @@ private[log] class LogCleanerManager(val logDirs: Seq[File],
import LogCleanerManager._
- override val loggerName = classOf[LogCleaner].getName
+ protected override def loggerName = classOf[LogCleaner].getName
// package-private for testing
private[log] val offsetCheckpointFile = "cleaner-offset-checkpoint"
diff --git a/core/src/main/scala/kafka/server/MetadataCache.scala b/core/src/main/scala/kafka/server/MetadataCache.scala
index eb2d835..7cdb8f1 100755
--- a/core/src/main/scala/kafka/server/MetadataCache.scala
+++ b/core/src/main/scala/kafka/server/MetadataCache.scala
@@ -23,7 +23,7 @@ import scala.collection.{Seq, Set, mutable}
import scala.collection.JavaConverters._
import kafka.cluster.{Broker, EndPoint}
import kafka.api._
-import kafka.common.{BrokerEndPointNotAvailableException, TopicAndPartition}
+import kafka.common.TopicAndPartition
import kafka.controller.StateChangeLogger
import kafka.utils.CoreUtils._
import kafka.utils.Logging
diff --git a/core/src/main/scala/kafka/utils/Logging.scala b/core/src/main/scala/kafka/utils/Logging.scala
index e409bba..0221821 100755
--- a/core/src/main/scala/kafka/utils/Logging.scala
+++ b/core/src/main/scala/kafka/utils/Logging.scala
@@ -17,8 +17,8 @@
package kafka.utils
-import com.typesafe.scalalogging.{LazyLogging, Logger}
-import org.slf4j.{Marker, MarkerFactory}
+import com.typesafe.scalalogging.Logger
+import org.slf4j.{LoggerFactory, Marker, MarkerFactory}
object Log4jControllerRegistration {
@@ -38,13 +38,16 @@ private object Logging {
private val FatalMarker: Marker = MarkerFactory.getMarker("FATAL")
}
-trait Logging extends LazyLogging {
- def loggerName: String = logger.underlying.getName
+trait Logging {
+
+ protected lazy val logger = Logger(LoggerFactory.getLogger(loggerName))
protected var logIdent: String = _
Log4jControllerRegistration
+ protected def loggerName: String = getClass.getName
+
protected def msgWithLogIdent(msg: String): String =
if (logIdent == null) msg else logIdent + msg
diff --git a/core/src/test/scala/integration/kafka/api/DelegationTokenEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/DelegationTokenEndToEndAuthorizationTest.scala
index efc5049..24f435e 100644
--- a/core/src/test/scala/integration/kafka/api/DelegationTokenEndToEndAuthorizationTest.scala
+++ b/core/src/test/scala/integration/kafka/api/DelegationTokenEndToEndAuthorizationTest.scala
@@ -84,7 +84,7 @@ class DelegationTokenEndToEndAuthorizationTest extends EndToEndAuthorizationTest
config.put(SaslConfigs.SASL_JAAS_CONFIG, clientLoginContext)
val adminClient = AdminClient.create(config.asScala.toMap)
- var (error, token) = adminClient.createToken(List())
+ val (error, token) = adminClient.createToken(List())
//wait for token to reach all the brokers
TestUtils.waitUntilTrue(() => servers.forall(server => !server.tokenCache.tokens().isEmpty),
diff --git a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala
index a4f3e0b..6240aa5 100644
--- a/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala
+++ b/core/src/test/scala/integration/kafka/api/SaslScramSslEndToEndAuthorizationTest.scala
@@ -17,8 +17,7 @@
package kafka.api
import org.apache.kafka.common.security.scram.ScramMechanism
-import kafka.utils.JaasTestUtils
-import kafka.utils.ZkUtils
+import kafka.utils.{JaasTestUtils, ZkUtils}
import scala.collection.JavaConverters._
import org.junit.Before
diff --git a/core/src/test/scala/integration/kafka/server/MultipleListenersWithDefaultJaasContextTest.scala b/core/src/test/scala/integration/kafka/server/MultipleListenersWithDefaultJaasContextTest.scala
index 10df84e..00695ed 100644
--- a/core/src/test/scala/integration/kafka/server/MultipleListenersWithDefaultJaasContextTest.scala
+++ b/core/src/test/scala/integration/kafka/server/MultipleListenersWithDefaultJaasContextTest.scala
@@ -21,8 +21,6 @@ import java.util.Properties
import kafka.api.Both
import kafka.utils.JaasTestUtils.JaasSection
-import org.apache.kafka.common.network.ListenerName
-
class MultipleListenersWithDefaultJaasContextTest extends MultipleListenersWithSameSecurityProtocolBaseTest {
diff --git a/core/src/test/scala/kafka/utils/LoggingTest.scala b/core/src/test/scala/kafka/utils/LoggingTest.scala
index c0600f8..b2bdee3 100644
--- a/core/src/test/scala/kafka/utils/LoggingTest.scala
+++ b/core/src/test/scala/kafka/utils/LoggingTest.scala
@@ -34,4 +34,28 @@ class LoggingTest extends Logging {
val instance = mbs.getObjectInstance(log4jControllerName)
assertEquals("kafka.utils.Log4jController", instance.getClassName)
}
+
+ @Test
+ def testLogNameOverride(): Unit = {
+ class TestLogging(overriddenLogName: String) extends Logging {
+ // Expose logger
+ def log = logger
+ override def loggerName = overriddenLogName
+ }
+ val overriddenLogName = "OverriddenLogName"
+ val logging = new TestLogging(overriddenLogName)
+
+ assertEquals(overriddenLogName, logging.log.underlying.getName)
+ }
+
+ @Test
+ def testLogName(): Unit = {
+ class TestLogging extends Logging {
+ // Expose logger
+ def log = logger
+ }
+ val logging = new TestLogging
+
+ assertEquals(logging.getClass.getName, logging.log.underlying.getName)
+ }
}
--
To stop receiving notification emails like this one, please contact
rsivaram@apache.org.