Skip to content

Fixed Issue QFJ-983, "SLF4JLog is suffixing category with session ID … #232

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

Merged
merged 1 commit into from
Aug 12, 2019
Merged

Fixed Issue QFJ-983, "SLF4JLog is suffixing category with session ID … #232

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
4 changes: 2 additions & 2 deletions quickfixj-core/src/main/java/quickfix/SLF4JLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ public SLF4JLog(SessionID sessionID, String eventCategory, String errorEventCate
}

private Logger getLogger(SessionID sessionID, String category, String defaultCategory, String logPrefix) {
return LoggerFactory.getLogger((category != null
return LoggerFactory.getLogger(logPrefix + (category != null
? substituteVariables(sessionID, category)
: defaultCategory) + logPrefix);
: defaultCategory));
}

private static final String FIX_MAJOR_VERSION_VAR = "\\$\\{fixMajorVersion}";
Expand Down
6 changes: 3 additions & 3 deletions quickfixj-core/src/test/java/quickfix/SLF4JLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ private void assertMessageLogged(SessionID sessionID, String categoryName, Strin
// The conditional is required because of a bug in SLF4J 1.0
// when used with JDK 1.4 logging. The wrapper does not pass
// the logger name.
assertEquals(categoryName + sessionID + ": ", r.getLoggerName());
assertEquals(sessionID + ": " + categoryName, r.getLoggerName());
}
assertEquals(message, r.getMessage());
}

private TestHandler getTestHandler(String categoryName, SessionID sessionID) {
final Logger logger = Logger.getLogger(categoryName + sessionID + ": ");
final Logger logger = Logger.getLogger(sessionID + ": " + categoryName);
TestHandler testHandler = null;
final Handler[] handlers = logger.getHandlers();
for (final Handler handler : handlers) {
Expand All @@ -214,7 +214,7 @@ private TestHandler getTestHandler(String categoryName, SessionID sessionID) {
}

private TestHandler setUpLoggerForTest(String category, SessionID sessionID) {
final Logger logger = Logger.getLogger(category + sessionID + ": ");
final Logger logger = Logger.getLogger(sessionID + ": " + category);
logger.setUseParentHandlers(false);
final Handler[] handlers = logger.getHandlers();
for (final Handler handler : handlers) {
Expand Down