Skip to content

Add debug logs for successful resource loading in Loader #4060

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

Open
ban-xiu wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+16 −2
Open

Add debug logs for successful resource loading in Loader #4060

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> c
LOGGER.trace("Trying to find [{}] using context class loader {}.", resource, classLoader);
final URL url = classLoader.getResource(resource);
if (url != null) {
LOGGER.debug("Found [{}] at {} using context class loader.", resource, url);
return url;
}
}
Expand All @@ -104,6 +105,7 @@ public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> c
LOGGER.trace("Trying to find [{}] using {} class loader.", resource, classLoader);
final URL url = classLoader.getResource(resource);
if (url != null) {
LOGGER.debug("Found [{}] at {} using {} class loader.", resource, url, classLoader);
return url;
}
}
Expand All @@ -112,6 +114,7 @@ public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> c
LOGGER.trace("Trying to find [{}] using {} class loader.", resource, defaultLoader);
final URL url = defaultLoader.getResource(resource);
if (url != null) {
LOGGER.debug("Found [{}] at {} using {} class loader.", resource, url, defaultLoader);
return url;
}
}
Expand All @@ -127,7 +130,11 @@ public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> c
// loader which the parent of the system class loader. Hence the
// code below.
LOGGER.trace("Trying to find [{}] using ClassLoader.getSystemResource().", resource);
return ClassLoader.getSystemResource(resource);
final URL url = ClassLoader.getSystemResource(resource);
if (url != null) {
LOGGER.debug("Found [{}] at {} using system class loader.", resource, url);
}
return url;
}

/**
Expand Down Expand Up @@ -157,6 +164,7 @@ public static InputStream getResourceAsStream(final String resource, final Class
LOGGER.trace("Trying to find [{}] using context class loader {}.", resource, classLoader);
is = classLoader.getResourceAsStream(resource);
if (is != null) {
LOGGER.debug("Found [{}] using context class loader {}.", resource, classLoader);
return is;
}
}
Expand All @@ -167,6 +175,7 @@ public static InputStream getResourceAsStream(final String resource, final Class
LOGGER.trace("Trying to find [{}] using {} class loader.", resource, classLoader);
is = classLoader.getResourceAsStream(resource);
if (is != null) {
LOGGER.debug("Found [{}] using {} class loader.", resource, classLoader);
return is;
}
}
Expand All @@ -176,6 +185,7 @@ public static InputStream getResourceAsStream(final String resource, final Class
LOGGER.trace("Trying to find [{}] using {} class loader.", resource, defaultLoader);
is = defaultLoader.getResourceAsStream(resource);
if (is != null) {
LOGGER.debug("Found [{}] using {} class loader.", resource, defaultLoader);
return is;
}
}
Expand All @@ -191,7 +201,11 @@ public static InputStream getResourceAsStream(final String resource, final Class
// loader which the parent of the system class loader. Hence the
// code below.
LOGGER.trace("Trying to find [{}] using ClassLoader.getSystemResource().", resource);
return ClassLoader.getSystemResourceAsStream(resource);
final InputStream is = ClassLoader.getSystemResourceAsStream(resource);
if (is != null) {
LOGGER.debug("Found [{}] using system class loader.", resource);
}
return is;
}

/**
Expand Down