Skip to content

Commit 4124466

Browse files
committed
Use org.elasticsearch.index instead of root logger in logging tests
1 parent 6c0518f commit 4124466

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,11 +2534,11 @@ public void testIndexWriterInfoStream() throws IllegalAccessException, IOExcepti
25342534
MockAppender mockAppender = new MockAppender("testIndexWriterInfoStream");
25352535
mockAppender.start();
25362536

2537-
Logger rootLogger = LogManager.getRootLogger();
2538-
Level savedLevel = rootLogger.getLevel();
2539-
Loggers.addAppender(rootLogger, mockAppender);
2540-
Loggers.setLevel(rootLogger, Level.DEBUG);
2541-
rootLogger = LogManager.getRootLogger();
2537+
Logger theLogger = LogManager.getLogger("org.elasticsearch.index");
2538+
Level savedLevel = theLogger.getLevel();
2539+
Loggers.addAppender(theLogger, mockAppender);
2540+
Loggers.setLevel(theLogger, Level.DEBUG);
2541+
theLogger = LogManager.getRootLogger();
25422542

25432543
try {
25442544
// First, with DEBUG, which should NOT log IndexWriter output:
@@ -2548,15 +2548,15 @@ public void testIndexWriterInfoStream() throws IllegalAccessException, IOExcepti
25482548
assertFalse(mockAppender.sawIndexWriterMessage);
25492549

25502550
// Again, with TRACE, which should log IndexWriter output:
2551-
Loggers.setLevel(rootLogger, Level.TRACE);
2551+
Loggers.setLevel(theLogger, Level.TRACE);
25522552
engine.index(indexForDoc(doc));
25532553
engine.flush();
25542554
assertTrue(mockAppender.sawIndexWriterMessage);
25552555
engine.close();
25562556
} finally {
2557-
Loggers.removeAppender(rootLogger, mockAppender);
2557+
Loggers.removeAppender(theLogger, mockAppender);
25582558
mockAppender.stop();
2559-
Loggers.setLevel(rootLogger, savedLevel);
2559+
Loggers.setLevel(theLogger, savedLevel);
25602560
}
25612561
}
25622562

@@ -2596,10 +2596,10 @@ public void testMergeThreadLogging() throws Exception {
25962596
final MockMergeThreadAppender mockAppender = new MockMergeThreadAppender("testMergeThreadLogging");
25972597
mockAppender.start();
25982598

2599-
Logger rootLogger = LogManager.getRootLogger();
2600-
Level savedLevel = rootLogger.getLevel();
2601-
Loggers.addAppender(rootLogger, mockAppender);
2602-
Loggers.setLevel(rootLogger, Level.TRACE);
2599+
Logger theLogger = LogManager.getLogger("org.elasticsearch.index");
2600+
Level savedLevel = theLogger.getLevel();
2601+
Loggers.addAppender(theLogger, mockAppender);
2602+
Loggers.setLevel(theLogger, Level.TRACE);
26032603
try {
26042604
LogMergePolicy lmp = newLogMergePolicy();
26052605
lmp.setMergeFactor(2);
@@ -2632,12 +2632,12 @@ public void testMergeThreadLogging() throws Exception {
26322632
assertThat(mockAppender.mergeCompleted(), is(true));
26332633
});
26342634

2635-
Loggers.setLevel(rootLogger, savedLevel);
2635+
Loggers.setLevel(theLogger, savedLevel);
26362636
engine.close();
26372637
}
26382638
} finally {
2639-
Loggers.setLevel(rootLogger, savedLevel);
2640-
Loggers.removeAppender(rootLogger, mockAppender);
2639+
Loggers.setLevel(theLogger, savedLevel);
2640+
Loggers.removeAppender(theLogger, mockAppender);
26412641
mockAppender.stop();
26422642
}
26432643
}

0 commit comments

Comments
 (0)