Skip to content

Commit 528c1f3

Browse files
committed
Restore sorting when applying loggers
1 parent ada4873 commit 528c1f3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.apache.logging.log4j.util.Unbox;
3737
import org.elasticsearch.cluster.ClusterName;
3838
import org.elasticsearch.common.logging.internal.LoggerFactoryImpl;
39+
import org.elasticsearch.common.settings.Setting;
3940
import org.elasticsearch.common.settings.Settings;
4041
import org.elasticsearch.core.SuppressForbidden;
4142
import org.elasticsearch.env.Environment;
@@ -55,6 +56,7 @@
5556
import java.nio.file.attribute.BasicFileAttributes;
5657
import java.util.ArrayList;
5758
import java.util.Collections;
59+
import java.util.Comparator;
5860
import java.util.EnumSet;
5961
import java.util.HashSet;
6062
import java.util.List;
@@ -352,6 +354,7 @@ private static void configureLoggerLevels(final Settings settings) {
352354
Loggers.LOG_LEVEL_SETTING.getAllConcreteSettings(settings)
353355
// do not set a log level for a logger named level (from the default log setting)
354356
.filter(s -> s.getKey().equals(Loggers.LOG_DEFAULT_LEVEL_SETTING.getKey()) == false)
357+
.sorted(Comparator.comparing(Setting::getKey))
355358
.forEach(s -> {
356359
final Level level = s.get(settings);
357360
Loggers.setLevel(LogManager.getLogger(s.getKey().substring("logger.".length())), level);

0 commit comments

Comments
 (0)