chore: rm actuators, refactoring

querwurzel · Dec 15, 2024 · c8e835e · c8e835e
1 parent 70a8aec
commit c8e835e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -19,10 +19,6 @@
             <artifactId>frontend</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>

diff --git a/backend/src/main/java/com/github/binpastes/paste/application/tracking/MessagingClient.java b/backend/src/main/java/com/github/binpastes/paste/application/tracking/MessagingClient.java
@@ -98,15 +98,15 @@ private ClientSession session() throws ActiveMQException {
         var session = sessions.get();
 
         if (session == null) {
-            session = this.sessionFactory.createSession(true, true);
+            session = this.sessionFactory.createSession();
             session.start();
             sessions.set(session);
         }
 
         return session;
     }
 
-    public record Message (
+    public record Message(
             String pasteId,
             Instant timeViewed
     ) {

diff --git a/backend/src/main/java/com/github/binpastes/paste/application/tracking/MessagingConfig.java b/backend/src/main/java/com/github/binpastes/paste/application/tracking/MessagingConfig.java
@@ -20,8 +20,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 @Configuration
 class MessagingConfig {
 
@@ -37,52 +35,57 @@ public MessagingClient messagingClient(
 
     @Bean(initMethod = "start", destroyMethod = "stop")
     public EmbeddedActiveMQ activeMqServer() throws Exception {
-        org.apache.activemq.artemis.core.config.Configuration config = new ConfigurationImpl();
+        var config = new ConfigurationImpl();
 
         config.addAddressConfiguration(new CoreAddressConfiguration()
                 .setName("binpastes")
                 .addQueueConfig(new QueueConfiguration()
                         .setName(new SimpleString("pasteTrackingQueue"))
                         .setAddress(new SimpleString("binpastes"))
                         .setMaxConsumers(1)
-                        .setDelayBeforeDispatch(SECONDS.toMillis(3))
+                        .setExclusive(true) // dispatch all messages to only one consumer at a time
+                        .setConsumersBeforeDispatch(1)
+                        .setDelayBeforeDispatch(TimeUnit.SECONDS.toMillis(5))
                         .setDurable(true)
                 )
                 .addRoutingType(RoutingType.ANYCAST));
 
         config.addAddressSetting("binpastes", new AddressSettings()
                 .setDefaultAddressRoutingType(RoutingType.ANYCAST)
                 .setDefaultQueueRoutingType(RoutingType.ANYCAST)
-                .setEnableIngressTimestamp(false)
-                .setExpiryDelay(TimeUnit.DAYS.toMillis(7))
+                .setRedeliveryDelay(TimeUnit.SECONDS.toMillis(5))
+                .setRedeliveryMultiplier(1.5)
+                .setMaxDeliveryAttempts(5)
+                .setAutoCreateDeadLetterResources(true)
         );
 
-        config.setMessageExpiryScanPeriod(SECONDS.toMillis(3));
-
         config.setName("binpastesMQ");
         config.addAcceptorConfiguration("in-vm", "vm://0");
 
         config.setGracefulShutdownEnabled(true);
-        config.setGracefulShutdownTimeout(SECONDS.toMillis(1));
+        config.setGracefulShutdownTimeout(TimeUnit.SECONDS.toMillis(1));
         config.setJournalPoolFiles(3);
         config.setSecurityEnabled(false);
         config.setJMXManagementEnabled(true);
 
+        config.setLargeMessageSync(false);
+
         config.setPersistDeliveryCountBeforeDelivery(true);
 
         config.setScheduledThreadPoolMaxSize(1);
-        config.setThreadPoolMaxSize(1);
+        config.setThreadPoolMaxSize(Runtime.getRuntime().availableProcessors());
+
         config.setPersistenceEnabled(true);
 
         config.setBindingsDirectory("./tracking/bindings");
         config.setJournalDirectory("./tracking/journal");
         config.setLargeMessagesDirectory("./tracking/large_messages");
         config.setPagingDirectory("./tracking/paging");
 
-        var embeddedActiveMQ = new EmbeddedActiveMQ();
-        embeddedActiveMQ.setConfiguration(config);
+        var server = new EmbeddedActiveMQ()
+                .setConfiguration(config);
 
-        return embeddedActiveMQ;
+        return server;
     }
 
     @Bean(initMethod = "init", destroyMethod = "dispose")
@@ -110,12 +113,14 @@ public Scheduler producerThreadPool() {
     @Bean(destroyMethod = "close")
     @DependsOn("activeMqServer")
     public ServerLocator serverLocator() throws Exception {
-        ServerLocator serverLocator = ActiveMQClient.createServerLocator("vm://0");
-        serverLocator.setReconnectAttempts(1);
-        serverLocator.setUseGlobalPools(false);
-        serverLocator.setAutoGroup(true);
-        serverLocator.setGroupID("binpastes-views");
-        serverLocator.setPreAcknowledge(true);
+        var serverLocator = ActiveMQClient.createServerLocator("vm://0")
+                .setReconnectAttempts(1)
+                .setFlowControlThreadPoolMaxSize(1)
+                .setScheduledThreadPoolMaxSize(1)
+                .setThreadPoolMaxSize(Runtime.getRuntime().availableProcessors())
+                .setUseGlobalPools(false)
+                .setAutoGroup(false)
+                .setPreAcknowledge(true); // tradeoff to lose views potentially
         return serverLocator;
     }
 

diff --git a/backend/src/main/java/com/github/binpastes/paste/domain/PasteService.java b/backend/src/main/java/com/github/binpastes/paste/domain/PasteService.java
@@ -12,6 +12,7 @@
 
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 import static com.github.binpastes.paste.domain.Paste.PasteExposure;
 
@@ -85,9 +86,13 @@ public Mono<Void> requestDeletion(String id, String remoteAddress) {
                 .map(Paste::markAsExpired)
                 .flatMap(pasteRepository::save)
                 .retryWhen(Retry
-                        .backoff(5, Duration.ofMillis(500))
+                        .backoff(3, Duration.ofMillis(100))
                         .filter(ex -> ex instanceof OptimisticLockingFailureException))
-                .doOnNext(paste -> log.info("Deleted paste {} on behalf of {}", paste.getId(), remoteAddress))
+                .doOnNext(paste -> log.atInfo()
+                        .addArgument(paste.getId())
+                        .addArgument(Objects.toString(remoteAddress, "anonymous"))
+                        .log("Deleted paste {} on behalf of {}")
+                )
                 .then();
     }
 }
diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
@@ -3,6 +3,7 @@
 #logging.level.org.apache.activemq.artemis.core.server=INFO
 #logging.level.org.flywaydb.core.internal.license.VersionPrinter=INFO
 logging.level.com.github.binpastes.paste.application.tracking=DEBUG
+logging.level.com.github.binpastes.paste.domain.PasteService=DEBUG
 
 spring.flyway.enabled=true
 spring.flyway.driver-class-name=org.h2.Driver