From 0d4167abe7e5bfe164eb37d9defd51bf739d6b8c Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Thu, 13 Jan 2022 15:19:10 +0100 Subject: [PATCH] fix SLF4J-499 Signed-off-by: Ceki Gulcu --- .../java/org/slf4j/simple/SimpleLogger.java | 2 +- .../simple/SimpleLoggerConfiguration.java | 1 + .../org/slf4j/simple/SimpleLoggerTest.java | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java index 4ef9fc36..ed154ec8 100644 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2004-2021 QOS.ch + * Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java index 855f9a4d..fb9808d8 100755 --- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java +++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLoggerConfiguration.java @@ -84,6 +84,7 @@ public class SimpleLoggerConfiguration { showShortLogName = getBooleanProperty(SimpleLogger.SHOW_SHORT_LOG_NAME_KEY, SHOW_SHORT_LOG_NAME_DEFAULT); showDateTime = getBooleanProperty(SimpleLogger.SHOW_DATE_TIME_KEY, SHOW_DATE_TIME_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); levelInBrackets = getBooleanProperty(SimpleLogger.LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS_DEFAULT); warnLevelString = getStringProperty(SimpleLogger.WARN_LEVEL_STRING_KEY, WARN_LEVELS_STRING_DEFAULT); diff --git a/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java b/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java index 2f025e56..ced12671 100644 --- a/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java +++ b/slf4j-simple/src/test/java/org/slf4j/simple/SimpleLoggerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2004-2012 QOS.ch + * Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -123,22 +123,23 @@ public class SimpleLoggerTest { replacement.flush(); assertTrue(bout.toString().contains("INFO " + this.getClass().getName() + " - hello")); } - + @Test - public void testTheadIdWithoutThreadName () { + public void testTheadIdWithoutThreadName() { 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); } @Test 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); } - private void commonTestThreadId(String patternStr) { - System.setErr(replacement); - System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString()); + + private void commonTestThreadId(String patternStr) { + System.setErr(replacement); + System.setProperty(SimpleLogger.SHOW_THREAD_ID_KEY, Boolean.TRUE.toString()); SimpleLogger.init(); SimpleLogger simpleLogger = new SimpleLogger(this.getClass().getName()); simpleLogger.info("hello"); @@ -147,5 +148,5 @@ public class SimpleLoggerTest { System.out.println(patternStr); System.out.println(output); assertTrue(Pattern.compile(patternStr).matcher(output).lookingAt()); - } + } }