-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix #445 upgrade to log4j2. Sqlg only uses log4j as part of the tests…
…, sqlg-core only uses slf4j
- Loading branch information
1 parent
1a112e8
commit ada5495
Showing
11 changed files
with
215 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Configuration status="WARN"> | ||
| <Appenders> | ||
| <Console name="Console" target="SYSTEM_OUT"> | ||
| <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> | ||
| </Console> | ||
| <Log4j2TestAppender name="Log4j2TestAppender" /> | ||
| </Appenders> | ||
| <Loggers> | ||
| <Logger name="com.mchange" level="error" /> | ||
| <Logger name="org.umlg.sqlg" level="info"> | ||
| <AppenderRef ref="Log4j2TestAppender"/> | ||
| </Logger> | ||
| <Logger name="hsqldb.db" level="warn" /> | ||
| <Root level="info"> | ||
| <AppenderRef ref="Console"/> | ||
| <AppenderRef ref="Log4j2TestAppender"/> | ||
| </Root> | ||
| </Loggers> | ||
| </Configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
sqlg-test/src/main/java/org/umlg/sqlg/Log4j2TestAppender.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package org.umlg.sqlg; | ||
|
|
||
| import org.apache.logging.log4j.core.Appender; | ||
| import org.apache.logging.log4j.core.Core; | ||
| import org.apache.logging.log4j.core.Filter; | ||
| import org.apache.logging.log4j.core.LogEvent; | ||
| import org.apache.logging.log4j.core.appender.AbstractAppender; | ||
| import org.apache.logging.log4j.core.config.plugins.Plugin; | ||
| import org.apache.logging.log4j.core.config.plugins.PluginAttribute; | ||
| import org.apache.logging.log4j.core.config.plugins.PluginElement; | ||
| import org.apache.logging.log4j.core.config.plugins.PluginFactory; | ||
|
|
||
| import java.util.LinkedList; | ||
|
|
||
| @Plugin( | ||
| name = "Log4j2TestAppender", | ||
| category = Core.CATEGORY_NAME, | ||
| elementType = Appender.ELEMENT_TYPE) | ||
| public class Log4j2TestAppender extends AbstractAppender { | ||
|
|
||
| private static final LinkedList<LogEvent> eventList = new LinkedList<>(); | ||
|
|
||
| public static LogEvent last(String name) { | ||
| synchronized (eventList) { | ||
| if (eventList.isEmpty()) { | ||
| return null; | ||
| } | ||
| LogEvent evt = eventList.removeLast(); | ||
| while (evt != null && evt.getLoggerName() != null && !evt.getLoggerName().equals(name)) { | ||
| evt = eventList.removeLast(); | ||
| } | ||
| eventList.clear(); | ||
| return evt; | ||
| } | ||
| } | ||
|
|
||
| protected Log4j2TestAppender(String name, Filter filter) { | ||
| super(name, filter, null, true, null); | ||
| } | ||
|
|
||
| @PluginFactory | ||
| public static Log4j2TestAppender createAppender( | ||
| @PluginAttribute("name") String name, | ||
| @PluginElement("Filter") Filter filter) { | ||
| return new Log4j2TestAppender(name, filter); | ||
| } | ||
|
|
||
| @Override | ||
| public void append(LogEvent event) { | ||
| synchronized (eventList) { | ||
| eventList.add(event); | ||
| // keep memory low, since we want the last event usually anyway | ||
| if (eventList.size() > 10) { | ||
| eventList.removeFirst(); | ||
| } | ||
| } | ||
| } | ||
| } |
116 changes: 56 additions & 60 deletions
116
sqlg-test/src/main/java/org/umlg/sqlg/TestAppender.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,65 @@ | ||
| package org.umlg.sqlg; | ||
|
|
||
| import java.util.LinkedList; | ||
|
|
||
| import org.apache.log4j.AppenderSkeleton; | ||
| import org.apache.log4j.spi.LoggingEvent; | ||
|
|
||
| /** | ||
| * Test appender to capture some explicit messages | ||
| * @author JP Moresmau | ||
| * | ||
| */ | ||
| public class TestAppender extends AppenderSkeleton { | ||
| private static final LinkedList<LoggingEvent> eventsList = new LinkedList<>(); | ||
|
|
||
| public static LinkedList<LoggingEvent> getEventsList() { | ||
| return eventsList; | ||
| } | ||
|
|
||
| /** | ||
| * get last event of the given name AND CLEARS THE LIST | ||
| * | ||
| * @param name the event name (class where event was logged) | ||
| * @return the event or null if none | ||
| */ | ||
| public static LoggingEvent getLast(String name){ | ||
| synchronized (eventsList) { | ||
| if (eventsList.isEmpty()){ | ||
| return null; | ||
| } | ||
| LoggingEvent evt=eventsList.removeLast(); | ||
| while (evt!=null && !evt.getLoggerName().equals(name)){ | ||
| evt=eventsList.removeLast(); | ||
| } | ||
| eventsList.clear(); | ||
| return evt; | ||
| } | ||
| } | ||
|
|
||
| public TestAppender() { | ||
|
|
||
| } | ||
|
|
||
| public TestAppender(boolean isActive) { | ||
| super(isActive); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean requiresLayout() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| protected void append(LoggingEvent event) { | ||
| synchronized (eventsList) { | ||
| eventsList.add(event); | ||
| // keep memory low, since we want the last event usually anyway | ||
| if (eventsList.size()>10){ | ||
| eventsList.removeFirst(); | ||
| } | ||
| } | ||
| } | ||
| public class TestAppender { | ||
| //public class TestAppender extends AppenderSkeleton { | ||
| // private static final LinkedList<LoggingEvent> eventsList = new LinkedList<>(); | ||
| // | ||
| // public static LinkedList<LoggingEvent> getEventsList() { | ||
| // return eventsList; | ||
| // } | ||
| // | ||
| // /** | ||
| // * get last event of the given name AND CLEARS THE LIST | ||
| // * | ||
| // * @param name the event name (class where event was logged) | ||
| // * @return the event or null if none | ||
| // */ | ||
| // public static LoggingEvent getLast(String name){ | ||
| // synchronized (eventsList) { | ||
| // if (eventsList.isEmpty()){ | ||
| // return null; | ||
| // } | ||
| // LoggingEvent evt=eventsList.removeLast(); | ||
| // while (evt!=null && !evt.getLoggerName().equals(name)){ | ||
| // evt=eventsList.removeLast(); | ||
| // } | ||
| // eventsList.clear(); | ||
| // return evt; | ||
| // } | ||
| // } | ||
| // | ||
| // public TestAppender() { | ||
| // | ||
| // } | ||
| // | ||
| // public TestAppender(boolean isActive) { | ||
| // super(isActive); | ||
| // } | ||
| // | ||
| // @Override | ||
| // public void close() { | ||
| // | ||
| // } | ||
| // | ||
| // @Override | ||
| // public boolean requiresLayout() { | ||
| // return false; | ||
| // } | ||
| // | ||
| // @Override | ||
| // protected void append(LoggingEvent event) { | ||
| // synchronized (eventsList) { | ||
| // eventsList.add(event); | ||
| // // keep memory low, since we want the last event usually anyway | ||
| // if (eventsList.size()>10){ | ||
| // eventsList.removeFirst(); | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| } |
Oops, something went wrong.