honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process TestLogging annotation value in prefix-first order 

We have to sort the logger names so they wouldn't override each other. Processing org.elasticsearch:DEBUG after org.elasticsearch.transport:TRACE resets the setting of the later
This commit is contained in:
Boaz Leskes 2016-12-23 09:03:43 +01:00
parent faaa671fb6
commit 215874aff3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java
View File

@ -28,6 +28,7 @@ import org.junit.runner.notification.RunListener;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
/** /**
* A {@link RunListener} that allows to change the log level for a specific test method. * A {@link RunListener} that allows to change the log level for a specific test method.
@ -81,8 +82,13 @@ public class LoggingListener extends RunListener {
if (map == null) { if (map == null) {
return null; return null;
} }
// sort the logging keys so they wouldn't override each other.
// for example, processing org.elasticsearch:DEBUG after org.elasticsearch.transport:TRACE
// will reset the later
TreeMap<String, String> sortedLogNames = new TreeMap<>(String::compareTo);
sortedLogNames.putAll(map);
Map<String, String> previousValues = new HashMap<>(); Map<String, String> previousValues = new HashMap<>();
for (Map.Entry<String, String> entry : map.entrySet()) { for (Map.Entry<String, String> entry : sortedLogNames.entrySet()) {
Logger logger = resolveLogger(entry.getKey()); Logger logger = resolveLogger(entry.getKey());
previousValues.put(entry.getKey(), logger.getLevel().toString()); previousValues.put(entry.getKey(), logger.getLevel().toString());
Loggers.setLevel(logger, entry.getValue()); Loggers.setLevel(logger, entry.getValue());