Skip to content

Commit 0284fef

Browse files
committed
MINOR: Move LoggingController log level resolution test to server
1 parent 5c93ec9 commit 0284fef

2 files changed

Lines changed: 46 additions & 20 deletions

File tree

core/src/test/scala/kafka/utils/LoggingTest.scala

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717

1818
package kafka.utils
1919

20-
import org.apache.kafka.server.logger.LoggingController
2120
import java.lang.management.ManagementFactory
2221

2322
import javax.management.ObjectName
2423
import org.junit.jupiter.api.Test
2524
import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue}
26-
import org.slf4j.LoggerFactory
2725

2826
class LoggingTest extends Logging {
2927

@@ -60,22 +58,4 @@ class LoggingTest extends Logging {
6058

6159
assertEquals(logging.getClass.getName, logging.log.underlying.getName)
6260
}
63-
64-
@Test
65-
def testLoggerLevelIsResolved(): Unit = {
66-
val controller = new LoggingController()
67-
val previousLevel = controller.getLogLevel("kafka")
68-
try {
69-
controller.setLogLevel("kafka", "TRACE")
70-
// Do some logging so that the Logger is created within the hierarchy
71-
// (until loggers are used only loggers in the config file exist)
72-
LoggerFactory.getLogger("kafka.utils.Log4jControllerTest").trace("test")
73-
assertEquals("TRACE", controller.getLogLevel("kafka"))
74-
assertEquals("TRACE", controller.getLogLevel("kafka.utils.Log4jControllerTest"))
75-
assertTrue(controller.getLoggers.contains("kafka=TRACE"))
76-
assertTrue(controller.getLoggers.contains("kafka.utils.Log4jControllerTest=TRACE"))
77-
} finally {
78-
controller.setLogLevel("kafka", previousLevel)
79-
}
80-
}
8161
}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.kafka.server.logger;
18+
19+
import org.junit.jupiter.api.Test;
20+
import org.slf4j.LoggerFactory;
21+
22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
24+
25+
public class LoggingControllerTest {
26+
27+
@Test
28+
public void testLoggerLevelIsResolved() {
29+
LoggingController controller = new LoggingController();
30+
String loggerName = "org.apache.kafka";
31+
String childLoggerName = "org.apache.kafka.server.logger.LoggingControllerTest";
32+
String previousLevel = controller.getLogLevel(loggerName);
33+
try {
34+
controller.setLogLevel(loggerName, "TRACE");
35+
// Do some logging so that the Logger is created within the hierarchy
36+
// (until loggers are used only loggers in the config file exist).
37+
LoggerFactory.getLogger(childLoggerName).trace("test");
38+
assertEquals("TRACE", controller.getLogLevel(loggerName));
39+
assertEquals("TRACE", controller.getLogLevel(childLoggerName));
40+
assertTrue(controller.getLoggers().contains(loggerName + "=TRACE"));
41+
assertTrue(controller.getLoggers().contains(childLoggerName + "=TRACE"));
42+
} finally {
43+
controller.setLogLevel(loggerName, previousLevel);
44+
}
45+
}
46+
}

0 commit comments

Comments
 (0)