fixes #141: Make Archiver config configurable

These are the new properties and their defaults:

conversation.archiver.conversation.max-work-queue-size default: 500
conversation.archiver.conversation.max-purge-interval default: 1000 (one second)
conversation.archiver.conversation.grace-period default: 50
conversation.archiver.message.max-work-queue-size default: 500
conversation.archiver.message.max-purge-interval default: 1000 (one second)
conversation.archiver.message.grace-period default: 50
conversation.archiver.participant.max-work-queue-size default: 500
conversation.archiver.participant.max-purge-interval default: 1000 (one second)
conversation.archiver.participant.grace-period default: 50

Author: guusdk

changelog.html

@@ -50,6 +50,7 @@ <h1>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/137'>Issue #137</a>] - MUC messages duplicated as one-on-one messages</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/138'>Issue #138</a>] - Stanzas not always stored for one-to-one messages whilst clustered</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/139'>Issue #139</a>] - Reduce code complexity</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/141'>Issue #141</a>] - Make Archiver configuration configurable</li>
 </ul>
 
 <p><b>2.1.0</b> -- September 10, 2020</p>

src/java/org/jivesoftware/openfire/archive/ConversationManager.java

@@ -1086,7 +1086,11 @@ private static class ConversationArchivingRunnable extends Archiver<Conversation
     {
         ConversationArchivingRunnable( String id )
         {
-            super( id, 500, Duration.ofSeconds( 1 ), Duration.ofMillis( 50 ) ); // TODO make values configurable.
+            super( id,
+                JiveGlobals.getIntProperty("conversation.archiver.conversation.max-work-queue-size", 500),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.conversation.max-purge-interval", 1000)),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.conversation.grace-period", 50))
+            );
         }
 
         protected void store( List<Conversation> workQueue )
@@ -1138,11 +1142,15 @@ protected void store( List<Conversation> workQueue )
     /**
      * Stores Messages in the database.
      */
-    private class MessageArchivingRunnable extends Archiver<ArchivedMessage>
+    private static class MessageArchivingRunnable extends Archiver<ArchivedMessage>
     {
         MessageArchivingRunnable( String id )
         {
-            super( id, 500, Duration.ofSeconds( 1 ), Duration.ofMillis( 50 ) ); // TODO make values configurable.
+            super( id,
+                JiveGlobals.getIntProperty("conversation.archiver.message.max-work-queue-size", 500),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.message.max-purge-interval", 1000)),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.message.grace-period", 50))
+            );
         }
 
         @Override
@@ -1206,7 +1214,11 @@ private static class ParticipantArchivingRunnable extends Archiver<RoomParticipa
     {
         ParticipantArchivingRunnable( String id )
         {
-            super( id, 500, Duration.ofSeconds( 1 ), Duration.ofMillis( 50 ) ); // TODO make values configurable.
+            super( id,
+                JiveGlobals.getIntProperty("conversation.archiver.participant.max-work-queue-size", 500),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.participant.max-purge-interval", 1000)),
+                Duration.ofMillis( JiveGlobals.getLongProperty("conversation.archiver.participant.grace-period", 50))
+            );
         }
 
         protected void store( List<RoomParticipant> workQueue )