natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix SLF4J-499 

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
This commit is contained in:
Ceki Gulcu 2022-01-13 15:19:10 +01:00
parent 60e70fbc83
commit 0d4167abe7
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright (c) 2004-2021 QOS.ch * Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining

1
slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java
View File

@ -84,6 +84,7 @@ public class SimpleLoggerConfiguration {
showShortLogName = getBooleanProperty(SimpleLogger.SHOW_SHORT_LOG_NAME_KEY, SHOW_SHORT_LOG_NAME_DEFAULT); showShortLogName = getBooleanProperty(SimpleLogger.SHOW_SHORT_LOG_NAME_KEY, SHOW_SHORT_LOG_NAME_DEFAULT);
showDateTime = getBooleanProperty(SimpleLogger.SHOW_DATE_TIME_KEY, SHOW_DATE_TIME_DEFAULT); showDateTime = getBooleanProperty(SimpleLogger.SHOW_DATE_TIME_KEY, SHOW_DATE_TIME_DEFAULT);
showThreadName = getBooleanProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME_DEFAULT); showThreadName = getBooleanProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME_DEFAULT);
showThreadId = getBooleanProperty(SimpleLogger.SHOW_THREAD_ID_KEY, SHOW_THREAD_ID_DEFAULT);
dateTimeFormatStr = getStringProperty(SimpleLogger.DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR_DEFAULT); dateTimeFormatStr = getStringProperty(SimpleLogger.DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR_DEFAULT);
levelInBrackets = getBooleanProperty(SimpleLogger.LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS_DEFAULT); levelInBrackets = getBooleanProperty(SimpleLogger.LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS_DEFAULT);
warnLevelString = getStringProperty(SimpleLogger.WARN_LEVEL_STRING_KEY, WARN_LEVELS_STRING_DEFAULT); warnLevelString = getStringProperty(SimpleLogger.WARN_LEVEL_STRING_KEY, WARN_LEVELS_STRING_DEFAULT);

19
slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright (c) 2004-2012 QOS.ch * Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
@ -123,22 +123,23 @@ public class SimpleLoggerTest {
replacement.flush(); replacement.flush();
assertTrue(bout.toString().contains("INFO " + this.getClass().getName() + " - hello")); assertTrue(bout.toString().contains("INFO " + this.getClass().getName() + " - hello"));
} }
@Test @Test
public void testTheadIdWithoutThreadName () { public void testTheadIdWithoutThreadName() {
System.setProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, Boolean.FALSE.toString()); System.setProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, Boolean.FALSE.toString());
String patternStr = "^tid=\\d{1,12} INFO org.slf4j.impl.SimpleLoggerTest - hello"; String patternStr = "^tid=\\d{1,12} INFO org.slf4j.simple.SimpleLoggerTest - hello";
commonTestThreadId(patternStr); commonTestThreadId(patternStr);
} }
@Test @Test
public void testThreadId() { public void testThreadId() {
String patternStr = "^\\[.*\\] tid=\\d{1,12} INFO org.slf4j.impl.SimpleLoggerTest - hello"; String patternStr = "^\\[.*\\] tid=\\d{1,12} INFO org.slf4j.simple.SimpleLoggerTest - hello";
commonTestThreadId(patternStr); commonTestThreadId(patternStr);
} }
private void commonTestThreadId(String patternStr) {
System.setErr(replacement); private void commonTestThreadId(String patternStr) {
System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString()); System.setErr(replacement);
System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString());
SimpleLogger.init(); SimpleLogger.init();
SimpleLogger simpleLogger = new SimpleLogger(this.getClass().getName()); SimpleLogger simpleLogger = new SimpleLogger(this.getClass().getName());
simpleLogger.info("hello"); simpleLogger.info("hello");
@ -147,5 +148,5 @@ public class SimpleLoggerTest {
System.out.println(patternStr); System.out.println(patternStr);
System.out.println(output); System.out.println(output);
assertTrue(Pattern.compile(patternStr).matcher(output).lookingAt()); assertTrue(Pattern.compile(patternStr).matcher(output).lookingAt());
} }
} }