@@ -63,39 +63,39 @@ class RedisAppenderPubSubTest {
6363 @ Order (4 )
6464 @ RegisterExtension
6565 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 ))));
9090
9191 @ Test
9292 void appended_messages_should_be_persisted () {
9393
9494 // Create the logger.
9595 LOGGER .debug ("creating the logger" );
9696 Logger logger = loggerContextExtension
97- .getLoggerContext ()
98- .getLogger (RedisAppenderPubSubTest .class .getCanonicalName ());
97+ .getLoggerContext ()
98+ .getLogger (RedisAppenderPubSubTest .class .getCanonicalName ());
9999
100100 // Create and log the messages.
101101 int minMessageCount = 1 ;
@@ -138,46 +138,46 @@ void throttler_should_not_flush_same_content_twice() {
138138 }
139139
140140 private void verifyLogging (
141- RedisTestMessage [] expectedLogMessages ,
142- int expectedTotalEventCount ,
143- int expectedRedisPushSuccessCount ) {
141+ RedisTestMessage [] expectedLogMessages ,
142+ int expectedTotalEventCount ,
143+ int expectedRedisPushSuccessCount ) {
144144
145145 // Verify the amount of persisted messages.
146146 LOGGER .debug ("{} waiting for the logged messages to be persisted" , LOGGER_PREFIX );
147147 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+ });
156156
157157 // Verify the content of persisted messages.
158158 LOGGER .debug ("{} verifying the content of persisted messages" , LOGGER_PREFIX );
159159 for (int messageIndex = 0 ; messageIndex < expectedLogMessages .length ; messageIndex ++) {
160160 RedisTestMessage expectedLogMessage = expectedLogMessages [messageIndex ];
161161 String expectedSerializedMessage = String .format (
162- "%s %s" ,
163- expectedLogMessage .level ,
164- expectedLogMessage .message );
162+ "%s %s" ,
163+ expectedLogMessage .level ,
164+ expectedLogMessage .message );
165165 String actualSerializedMessage = redisSubscriberExtension .nextMessage ();
166166 try {
167167 Assertions .assertThat (actualSerializedMessage ).isEqualTo (expectedSerializedMessage );
168168 } catch (AssertionError error ) {
169169 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 );
173173 throw new AssertionError (message , error );
174174 }
175175 }
176176
177177 // Verify the throttler counters.
178178 Appender appender = loggerContextExtension
179- .getConfig ()
180- .getAppender (redisAppenderName );
179+ .getConfig ()
180+ .getAppender (redisAppenderName );
181181 Assertions .assertThat (appender ).isInstanceOf (RedisAppender .class );
182182 RedisThrottlerJmxBean jmxBean = ((RedisAppender ) appender ).getJmxBean ();
183183 Assertions .assertThat (jmxBean .getTotalEventCount ()).isEqualTo (expectedTotalEventCount );
0 commit comments