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

Replace log4j:WARN with reload4j:WARN #69

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

Replace log4j:WARN with reload4j:WARN #69

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/main/java/org/apache/log4j/Hierarchy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void emitNoAppenderWarning(Category cat) {
if (!this.emittedNoAppenderWarning) {
LogLog.warn("No appenders could be found for logger (" + cat.getName() + ").");
LogLog.warn("Please initialize the log4j system properly.");
LogLog.warn("See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more info.");
LogLog.warn("See https://reload4j.qos.ch/faq.html#noconfig for more info.");
this.emittedNoAppenderWarning = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/log4j/LogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static public LoggerRepository getLoggerRepository() {
repositorySelector = new DefaultRepositorySelector(new NOPLoggerRepository());
guard = null;
Exception ex = new IllegalStateException("Class invariant violation");
String msg = "log4j called after unloading, see http://logging.apache.org/log4j/1.2/faq.html#unload.";
String msg = "log4j called after unloading, see https://reload4j.qos.ch/faq.html#unload.";
if (isLikelySafeScenario(ex)) {
LogLog.debug(msg, ex);
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/apache/log4j/helpers/LogLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public class LogLog {
*/
private static boolean quietMode = false;

private static final String PREFIX = "log4j: ";
private static final String ERR_PREFIX = "log4j:ERROR ";
private static final String WARN_PREFIX = "log4j:WARN ";
private static final String PREFIX = "reload4j: ";
private static final String ERR_PREFIX = "reload4j:ERROR ";
private static final String WARN_PREFIX = "reload4j:WARN ";

static {
String key = OptionConverter.getSystemProperty(DEBUG_KEY, null);
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/apache/log4j/xml/DOMTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ public void externalEntitiesTest() throws Exception {
System.setErr(sps);
DOMConfigurator.configure(TEST_INPUT_PREFIX + "xml/DOMTest4.xml");
common();
assertTrue(sps.stringList.get(0).contains("log4j:ERROR No appender named [A1] could be found."));
assertTrue(sps.stringList.get(1).contains("log4j:ERROR No appender named [A1] could be found."));
assertTrue(sps.stringList.get(2).contains("log4j:ERROR No appender named [A2] could be found."));
assertTrue(sps.stringList.get(0).contains("reload4j:ERROR No appender named [A1] could be found."));
assertTrue(sps.stringList.get(1).contains("reload4j:ERROR No appender named [A1] could be found."));
assertTrue(sps.stringList.get(2).contains("reload4j:ERROR No appender named [A2] could be found."));
} finally {
System.setErr(oldErr);
}
Expand Down
Loading