LOG4J2-3472 support custom WaitStrategy configuration #824

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

Jump to bottom

Merged

remkop merged 12 commits into apache:release-2.x from remkop:LOG4J2-3472-WaitStrategyFactory

Apr 20, 2022

Contributor

remkop commented Apr 19, 2022

This PR implements the change discussed in https://issues.apache.org/jira/browse/LOG4J2-3472:

Allow the configuration of custom WaitStrategy implementations by specifying a org.apache.logging.log4j.core.async.AsyncWaitStrategyFactory implementation.
Configuration looks similar to the below:

<Configuration>
  <AsyncWaitStrategyFactory
      class="my.package.MyWaitStrategyFactory" />

remkop added 3 commits

April 19, 2022 19:28


          LOG4J2-3472 make disruptor WaitStrategy configurable in Log4j configu…

618e6ca

…ration


          LOG4J2-3472 custom WaitStrategy additional tests

8dd38f1


          LOG4J2-3472 custom WaitStrategy documentation

a3f054f

garydgregory reviewed

View reviewed changes

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java Outdated Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactory.java Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

...-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

...pache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java Outdated Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

...pache/logging/log4j/core/async/AsyncWaitStrategyFactoryIncorrectConfigGlobalLoggersTest.java Outdated Show resolved Hide resolved

garydgregory reviewed

View reviewed changes

log4j-core/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml Outdated Show resolved Hide resolved

garydgregory requested changes

View reviewed changes

Member

garydgregory left a comment

Hi @remkop
I scattered some comments.

remkop added 4 commits

April 19, 2022 20:01


          LOG4J2-3472 files should end with newline

29fdca6


          LOG4J2-3472 make internals available with package-protected getters f…

a68d3c4

…or testing


          LOG4J2-3472 clear all modified system properties after test is done

a89e33d


          LOG4J2-3472 (DOC) clarify specification

1b989b9

Contributor Author

remkop commented Apr 19, 2022

@garydgregory Awesome fast feedback Gary! Super appreciated!


          LOG4J2-3472 package-protected getter

86fe545

Member

garydgregory commented Apr 19, 2022

@garydgregory Awesome fast feedback Gary! Super appreciated!

@remkop
You're welcome! 😀👍

Contributor Author

remkop commented Apr 19, 2022

@garydgregory Thanks for your replies! Are you okay with the PR as it is now? (The github review status still says "changes requested"...)

garydgregory approved these changes

View reviewed changes

Member

garydgregory left a comment

LGTM.

ppkarwasz reviewed

View reviewed changes

...re/src/test/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfigTest.java Outdated Show resolved Hide resolved

carterkozak reviewed

View reviewed changes

...j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfig.java Outdated Show resolved Hide resolved

remkop added 2 commits

April 20, 2022 05:10


          LOG4J2-3472 fix package-protected getters

425389c


          LOG4J2-3472 check that user-specified class implements AsyncWaitStrat…

…egyFactory

Contributor Author

remkop commented Apr 19, 2022

@carterkozak and @ppkarwasz Thank you for your reviews!


          LOG4J2-3472 code cleanup

52713b8

Contributor Author

remkop commented Apr 20, 2022

Rats, it turns out that I need to add the license text to some files:

log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncWaitStrategyFactoryConfig.java
log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncWaitStrategyFactory.java

I will do that when I get home later today.


          LOG4J2-3472 add missing license text

b45e49c

ppkarwasz approved these changes

View reviewed changes

Contributor

ppkarwasz left a comment

LGTM

remkop merged commit 786c011 into apache:release-2.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet