Merge pull request #638 from JNU-econovation/feat/#637

[BE/FEAT] Async 스레드 풀 사이즈 조절 및 예외 핸들링외 핸들링 및 ThreadPoolTaskExecutor 값 수정

Author: hwangdaesun

src/main/java/com/gaebaljip/exceed/adapter/out/aws/EmailAdapter.java

@@ -8,7 +8,7 @@
 import com.gaebaljip.exceed.application.port.out.member.EmailPort;
 
 import lombok.RequiredArgsConstructor;
-import software.amazon.awssdk.services.ses.SesAsyncClient;
+import software.amazon.awssdk.services.ses.SesClient;
 import software.amazon.awssdk.services.ses.model.*;
 
 @Component
@@ -18,12 +18,11 @@ public class EmailAdapter implements EmailPort {
     @Value("${cloud.aws.ses.mail-address}")
     private String mailAddress;
 
-    private final SesAsyncClient sesAsyncClient;
+    private final SesClient sesClient;
     private final SpringTemplateEngine htmlTemplateEngine;
 
     @Override
     public void sendEmail(String to, String title, String template, Context context) {
-
         String html = htmlTemplateEngine.process(template, context);
 
         SendEmailRequest sendEmailRequest =
@@ -33,7 +32,7 @@ public void sendEmail(String to, String title, String template, Context context)
                         .source(mailAddress)
                         .build();
 
-        sesAsyncClient.sendEmail(sendEmailRequest);
+        sesClient.sendEmail(sendEmailRequest);
     }
 
     private Message newMessage(String subject, String html) {

src/main/java/com/gaebaljip/exceed/common/event/handler/InCompleteSignUpMemberEventListener.java

@@ -28,25 +28,20 @@ public class InCompleteSignUpMemberEventListener {
 
     private Long expiredTime = 600000L;
 
-    @EventListener(classes = IncompleteSignUpEvent.class)
     @Async
+    @EventListener(classes = IncompleteSignUpEvent.class)
     public void handle(IncompleteSignUpEvent event) {
         int randomCode = createRandom();
         codePort.saveWithExpiration(event.getEmail(), String.valueOf(randomCode), expiredTime);
         Context context = new Context();
         context.setVariable(
                 MailTemplate.SIGN_UP_MAIL_CONTEXT, URL + MailTemplate.REPLY_TO_SIGN_UP_MAIL_URL);
         context.setVariable(MailTemplate.SIGN_UP_CODE, randomCode);
-        try {
-            emailPort.sendEmail(
-                    event.getEmail(),
-                    MailTemplate.SIGN_UP_TITLE,
-                    MailTemplate.SIGN_UP_TEMPLATE,
-                    context);
-        } catch (Exception e) {
-            log.info("msg : {}", "메일 전송에 실패했습니다.");
-            codePort.delete(event.getEmail());
-        }
+        emailPort.sendEmail(
+                event.getEmail(),
+                MailTemplate.SIGN_UP_TITLE,
+                MailTemplate.SIGN_UP_TEMPLATE,
+                context);
     }
 
     private int createRandom() {

src/main/java/com/gaebaljip/exceed/common/event/handler/SendEmailEventListener.java

@@ -1,11 +1,9 @@
 package com.gaebaljip.exceed.common.event.handler;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.event.TransactionalEventListener;
 import org.thymeleaf.context.Context;
 
 import com.gaebaljip.exceed.application.domain.member.Code;
@@ -27,9 +25,8 @@ public class SendEmailEventListener {
 
     private Long expiredTime = 600000L;
 
-    @TransactionalEventListener(classes = SendEmailEvent.class)
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Async
+    @EventListener(classes = SendEmailEvent.class)
     public void handle(SendEmailEvent event) {
         int randomCode = createRandom();
         codePort.saveWithExpiration(event.getEmail(), String.valueOf(randomCode), expiredTime);

src/main/java/com/gaebaljip/exceed/common/event/handler/SignUpMemberEventListener.java

@@ -1,11 +1,9 @@
 package com.gaebaljip.exceed.common.event.handler;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.event.TransactionalEventListener;
 import org.thymeleaf.context.Context;
 
 import com.gaebaljip.exceed.application.domain.member.Code;
@@ -28,9 +26,8 @@ public class SignUpMemberEventListener {
 
     private Long expiredTime = 600000L;
 
-    @TransactionalEventListener(classes = SignUpMemberEvent.class)
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Async
+    @EventListener(classes = SignUpMemberEvent.class)
     public void handle(SignUpMemberEvent event) {
         int randomCode = createRandom();
         codePort.saveWithExpiration(event.getEmail(), String.valueOf(randomCode), expiredTime);

src/main/java/com/gaebaljip/exceed/common/exception/EatCeedAsyncUncaughtExceptionHandler.java

@@ -0,0 +1,20 @@
+package com.gaebaljip.exceed.common.exception;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EatCeedAsyncUncaughtExceptionHandler implements AsyncUncaughtExceptionHandler {
+    @Override
+    public void handleUncaughtException(Throwable ex, Method method, Object... params) {
+        log.error(
+                "Exception in async method: {}, Params: {}, Message : {}",
+                method.getName(),
+                Arrays.toString(params),
+                ex.getMessage());
+    }
+}

src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java

@@ -1,14 +1,16 @@
 package com.gaebaljip.exceed.config;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
 
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
-import com.gaebaljip.exceed.common.exception.member.MailSendException;
+import com.gaebaljip.exceed.common.exception.EatCeedAsyncUncaughtExceptionHandler;
 
 @EnableAsync
 @Configuration
@@ -17,15 +19,17 @@ public class AsyncConfig implements AsyncConfigurer {
     @Override
     public Executor getAsyncExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(16);
-        executor.setMaxPoolSize(25);
+        executor.setCorePoolSize(5);
+        executor.setMaxPoolSize(15);
         executor.setQueueCapacity(10);
-        executor.setKeepAliveSeconds(60);
-        executor.setRejectedExecutionHandler(
-                (r, exec) -> {
-                    throw MailSendException.EXECPTION;
-                });
+        executor.setRejectedExecutionHandler(new AbortPolicy());
+        executor.setWaitForTasksToCompleteOnShutdown(true);
         executor.initialize();
         return executor;
     }
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new EatCeedAsyncUncaughtExceptionHandler();
+    }
 }

src/main/java/com/gaebaljip/exceed/config/SesConfig.java

@@ -3,12 +3,14 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.ses.SesAsyncClient;
+import software.amazon.awssdk.services.ses.SesClient;
 
 @Configuration
+@Profile("!test")
 public class SesConfig {
 
     @Value("${cloud.aws.credentials.access-key}")
@@ -21,9 +23,8 @@ public class SesConfig {
     private String region;
 
     @Bean
-    public SesAsyncClient sesAsyncClient() {
-
-        return SesAsyncClient.builder()
+    public SesClient sesClient() {
+        return SesClient.builder()
                 .credentialsProvider(() -> AwsBasicCredentials.create(accessKey, secretKey))
                 .region(Region.of(region))
                 .build();

src/test/java/com/gaebaljip/exceed/common/MockSesConfig.java

@@ -0,0 +1,15 @@
+package com.gaebaljip.exceed.common;
+
+import org.mockito.Mockito;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import software.amazon.awssdk.services.ses.SesClient;
+
+@Configuration
+public class MockSesConfig {
+    @Bean
+    public SesClient sesClient() {
+        return Mockito.mock(SesClient.class);
+    }
+}