@@ -63,39 +63,39 @@ class RedisAppenderPubSubTest {
63
63
@ Order (4 )
64
64
@ RegisterExtension
65
65
final LoggerContextExtension loggerContextExtension =
66
- new LoggerContextExtension (
67
- CLASS_NAME ,
68
- redisAppenderName ,
69
- configBuilder -> configBuilder .add (configBuilder
70
- .newAppender (redisAppenderName , "RedisAppender" )
71
- .addAttribute ("host" , redisHost )
72
- .addAttribute ("port" , redisPort )
73
- .addAttribute ("username" , redisUsername )
74
- .addAttribute ("password" , redisPassword )
75
- .addAttribute ("key" , redisKey )
76
- .addAttribute ("ignoreExceptions" , false )
77
- .addAttribute ("command" , "publish" )
78
- .add (configBuilder
79
- .newLayout ("PatternLayout" )
80
- .addAttribute ("pattern" , "%level %m" ))
81
- .addComponent (configBuilder
82
- .newComponent ("RedisThrottlerConfig" )
83
- // Batch size needs to be greater than 1, so that we can observe a partially filled batch push.
84
- .addAttribute ("batchSize" , 10 )
85
- .addAttribute ("bufferSize" , 100 )
86
- .addAttribute ("flushPeriodMillis" , 500L )
87
- .addAttribute ("maxEventCountPerSecond" , 35 )
88
- .addAttribute ("maxErrorCountPerSecond" , 0 )
89
- .addAttribute ("maxByteCountPerSecond" , 4194304 ))));
66
+ new LoggerContextExtension (
67
+ CLASS_NAME ,
68
+ redisAppenderName ,
69
+ configBuilder -> configBuilder .add (configBuilder
70
+ .newAppender (redisAppenderName , "RedisAppender" )
71
+ .addAttribute ("host" , redisHost )
72
+ .addAttribute ("port" , redisPort )
73
+ .addAttribute ("username" , redisUsername )
74
+ .addAttribute ("password" , redisPassword )
75
+ .addAttribute ("key" , redisKey )
76
+ .addAttribute ("ignoreExceptions" , false )
77
+ .addAttribute ("command" , "publish" )
78
+ .add (configBuilder
79
+ .newLayout ("PatternLayout" )
80
+ .addAttribute ("pattern" , "%level %m" ))
81
+ .addComponent (configBuilder
82
+ .newComponent ("RedisThrottlerConfig" )
83
+ // Batch size needs to be greater than 1, so that we can observe a partially filled batch push.
84
+ .addAttribute ("batchSize" , 10 )
85
+ .addAttribute ("bufferSize" , 100 )
86
+ .addAttribute ("flushPeriodMillis" , 500L )
87
+ .addAttribute ("maxEventCountPerSecond" , 35 )
88
+ .addAttribute ("maxErrorCountPerSecond" , 0 )
89
+ .addAttribute ("maxByteCountPerSecond" , 4194304 ))));
90
90
91
91
@ Test
92
92
void appended_messages_should_be_persisted () {
93
93
94
94
// Create the logger.
95
95
LOGGER .debug ("creating the logger" );
96
96
Logger logger = loggerContextExtension
97
- .getLoggerContext ()
98
- .getLogger (RedisAppenderPubSubTest .class .getCanonicalName ());
97
+ .getLoggerContext ()
98
+ .getLogger (RedisAppenderPubSubTest .class .getCanonicalName ());
99
99
100
100
// Create and log the messages.
101
101
int minMessageCount = 1 ;
@@ -138,46 +138,46 @@ void throttler_should_not_flush_same_content_twice() {
138
138
}
139
139
140
140
private void verifyLogging (
141
- RedisTestMessage [] expectedLogMessages ,
142
- int expectedTotalEventCount ,
143
- int expectedRedisPushSuccessCount ) {
141
+ RedisTestMessage [] expectedLogMessages ,
142
+ int expectedTotalEventCount ,
143
+ int expectedRedisPushSuccessCount ) {
144
144
145
145
// Verify the amount of persisted messages.
146
146
LOGGER .debug ("{} waiting for the logged messages to be persisted" , LOGGER_PREFIX );
147
147
Awaitility
148
- .await ()
149
- .pollDelay (Duration .ofMillis (100 ))
150
- .atMost (Duration .ofSeconds (10 ))
151
- .until (() -> {
152
- long persistedMessageCount = redisSubscriberExtension .messageCount ();
153
- Assertions .assertThat (persistedMessageCount ).isLessThanOrEqualTo (expectedTotalEventCount );
154
- return persistedMessageCount == expectedTotalEventCount ;
155
- });
148
+ .await ()
149
+ .pollDelay (Duration .ofMillis (100 ))
150
+ .atMost (Duration .ofSeconds (10 ))
151
+ .until (() -> {
152
+ long persistedMessageCount = redisSubscriberExtension .messageCount ();
153
+ Assertions .assertThat (persistedMessageCount ).isLessThanOrEqualTo (expectedTotalEventCount );
154
+ return persistedMessageCount == expectedTotalEventCount ;
155
+ });
156
156
157
157
// Verify the content of persisted messages.
158
158
LOGGER .debug ("{} verifying the content of persisted messages" , LOGGER_PREFIX );
159
159
for (int messageIndex = 0 ; messageIndex < expectedLogMessages .length ; messageIndex ++) {
160
160
RedisTestMessage expectedLogMessage = expectedLogMessages [messageIndex ];
161
161
String expectedSerializedMessage = String .format (
162
- "%s %s" ,
163
- expectedLogMessage .level ,
164
- expectedLogMessage .message );
162
+ "%s %s" ,
163
+ expectedLogMessage .level ,
164
+ expectedLogMessage .message );
165
165
String actualSerializedMessage = redisSubscriberExtension .nextMessage ();
166
166
try {
167
167
Assertions .assertThat (actualSerializedMessage ).isEqualTo (expectedSerializedMessage );
168
168
} catch (AssertionError error ) {
169
169
String message = String .format (
170
- "comparison failure (messageIndex=%d, messageCount=%d)" ,
171
- messageIndex ,
172
- expectedTotalEventCount );
170
+ "comparison failure (messageIndex=%d, messageCount=%d)" ,
171
+ messageIndex ,
172
+ expectedTotalEventCount );
173
173
throw new AssertionError (message , error );
174
174
}
175
175
}
176
176
177
177
// Verify the throttler counters.
178
178
Appender appender = loggerContextExtension
179
- .getConfig ()
180
- .getAppender (redisAppenderName );
179
+ .getConfig ()
180
+ .getAppender (redisAppenderName );
181
181
Assertions .assertThat (appender ).isInstanceOf (RedisAppender .class );
182
182
RedisThrottlerJmxBean jmxBean = ((RedisAppender ) appender ).getJmxBean ();
183
183
Assertions .assertThat (jmxBean .getTotalEventCount ()).isEqualTo (expectedTotalEventCount );
0 commit comments