Skip to content

Commit 0d4167a

Browse files
committed
fix SLF4J-499
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
1 parent 60e70fb commit 0d4167a

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2004-2021 QOS.ch
2+
* Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
33
* All rights reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining

slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ void init() {
8484
showShortLogName = getBooleanProperty(SimpleLogger.SHOW_SHORT_LOG_NAME_KEY, SHOW_SHORT_LOG_NAME_DEFAULT);
8585
showDateTime = getBooleanProperty(SimpleLogger.SHOW_DATE_TIME_KEY, SHOW_DATE_TIME_DEFAULT);
8686
showThreadName = getBooleanProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME_DEFAULT);
87+
showThreadId = getBooleanProperty(SimpleLogger.SHOW_THREAD_ID_KEY, SHOW_THREAD_ID_DEFAULT);
8788
dateTimeFormatStr = getStringProperty(SimpleLogger.DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR_DEFAULT);
8889
levelInBrackets = getBooleanProperty(SimpleLogger.LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS_DEFAULT);
8990
warnLevelString = getStringProperty(SimpleLogger.WARN_LEVEL_STRING_KEY, WARN_LEVELS_STRING_DEFAULT);

slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2004-2012 QOS.ch
2+
* Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
33
* All rights reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining
@@ -123,22 +123,23 @@ public void checkUseOfCachedOutputStream() {
123123
replacement.flush();
124124
assertTrue(bout.toString().contains("INFO " + this.getClass().getName() + " - hello"));
125125
}
126-
126+
127127
@Test
128-
public void testTheadIdWithoutThreadName () {
128+
public void testTheadIdWithoutThreadName() {
129129
System.setProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, Boolean.FALSE.toString());
130-
String patternStr = "^tid=\\d{1,12} INFO org.slf4j.impl.SimpleLoggerTest - hello";
130+
String patternStr = "^tid=\\d{1,12} INFO org.slf4j.simple.SimpleLoggerTest - hello";
131131
commonTestThreadId(patternStr);
132132
}
133133

134134
@Test
135135
public void testThreadId() {
136-
String patternStr = "^\\[.*\\] tid=\\d{1,12} INFO org.slf4j.impl.SimpleLoggerTest - hello";
136+
String patternStr = "^\\[.*\\] tid=\\d{1,12} INFO org.slf4j.simple.SimpleLoggerTest - hello";
137137
commonTestThreadId(patternStr);
138138
}
139-
private void commonTestThreadId(String patternStr) {
140-
System.setErr(replacement);
141-
System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString());
139+
140+
private void commonTestThreadId(String patternStr) {
141+
System.setErr(replacement);
142+
System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString());
142143
SimpleLogger.init();
143144
SimpleLogger simpleLogger = new SimpleLogger(this.getClass().getName());
144145
simpleLogger.info("hello");
@@ -147,5 +148,5 @@ private void commonTestThreadId(String patternStr) {
147148
System.out.println(patternStr);
148149
System.out.println(output);
149150
assertTrue(Pattern.compile(patternStr).matcher(output).lookingAt());
150-
}
151+
}
151152
}

0 commit comments

Comments
 (0)