GH-970: Add AmqpAppender.verifyHostname option
#971
Merged
Conversation
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
Fixes spring-projects#970 * Some code polishing and internal refactoring for `AmqpAppender` **Cherry-pick to 2.1.x**
garyrussell
suggested changes
Apr 8, 2019
There was a problem hiding this comment.
What about the Log4j2 appender?
Also
Task :spring-rabbit:checkstyleMain
[ant:checkstyle] [ERROR] /home/travis/build/spring-projects/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java:24:8: Unused import - java.util.Optional. [UnusedImports]
[ant:checkstyle] [ERROR] /home/travis/build/spring-projects/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java:403:24: Reference to instance variable 'verifyHostname' needs "this.". [RequireThis]
| @@ -620,7 +641,7 @@ public void start() { | |||
| if (rabbitConnectionFactory != null) { | |||
| super.start(); | |||
| this.routingKeyLayout.setPattern(this.routingKeyLayout.getPattern() | |||
| .replaceAll("%property\\{applicationId\\}", this.applicationId)); | |||
| .replaceAll("%property\\{applicationId}", this.applicationId)); | |||
There was a problem hiding this comment.
This looks wrong, curly brackets must be escaped in RegEx.
Isn't there a test for this?
There was a problem hiding this comment.
This is what my IDEA shows me:
And yes: it is covered by our tests.
Look into logback-test.xml and log4j2-amqp-appender.xml and search for {applicationId}
* Add `verifyHostname` to the Log4J `AmqpAppender` * Document `verifyHostname` option
garyrussell
approved these changes
Apr 8, 2019
|
I failed to cherry-pick this; 462efc4 |
|
OK. I'll do that myself later or issue a back-port PR. |
|
Wait. Looks like you have figured that out: 462efc4 Thanks |
|
Sorry, yes; the link to the cherry pick was in my comment; I should have made that clear. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #970
AmqpAppenderCherry-pick to 2.1.x