Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Adds feature that allows to prefer a provider #350

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

✨ Adds feature that allows to prefer a provider #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 25 additions & 2 deletions slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private final static void bind() {
List<SLF4JServiceProvider> providersList = findServiceProviders();
reportMultipleBindingAmbiguity(providersList);
if (providersList != null && !providersList.isEmpty()) {
PROVIDER = providersList.get(0);
PROVIDER = preferProvider(providersList);
// SLF4JServiceProvider.initialize() is intended to be called here and nowhere else.
PROVIDER.initialize();
INITIALIZATION_STATE = SUCCESSFUL_INITIALIZATION;
Expand All @@ -199,6 +199,29 @@ private final static void bind() {
}
}

/**
* In case of multiple providers, it picks the one from "slf4j.preferred.provider" system property,
* or leave the default one.
* @param providersList List<SLF4JServiceProvider> providers
* @return SLF4JServiceProvider the found provider, matching class name provided in the system property
* if found, default one otherwise
*/
private static SLF4JServiceProvider preferProvider(List<SLF4JServiceProvider> providersList) {
final String preferred = System.getProperty("slf4j.preferred.provider", "");
SLF4JServiceProvider found = providersList.get(0);
if (preferred == null || preferred.isEmpty()) {
return found;
} else {
Util.report("Preferred provider : " + preferred);
}
return providersList.stream()
.filter(provider -> preferred.equalsIgnoreCase(provider.getClass().getName()))
.findFirst().orElseGet(() -> {
Util.report("Preferred provider not found in the providers, use " + found);
return found;
});
}

private static void reportIgnoredStaticLoggerBinders(Set<URL> staticLoggerBinderPathSet) {
if (staticLoggerBinderPathSet.isEmpty()) {
return;
Expand Down Expand Up @@ -374,7 +397,7 @@ private static void reportMultipleBindingAmbiguity(List<SLF4JServiceProvider> pr
private static void reportActualBinding(List<SLF4JServiceProvider> providerList) {
// binderPathSet can be null under Android
if (!providerList.isEmpty() && isAmbiguousProviderList(providerList)) {
Util.report("Actual provider is of type [" + providerList.get(0) + "]");
Util.report("Actual provider is of type [" + PROVIDER + "]");
}
}

Expand Down