diff --git a/.github/workflows/prod-CD.yml b/.github/workflows/prod-CD.yml deleted file mode 100644 index 8e5b69e..0000000 --- a/.github/workflows/prod-CD.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: LUPG Prod Server CD Workflows - -on: - push: - branches: [ "main" ] - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - # Docker Deploy - - name: Docker Deploy - uses: appleboy/ssh-action@master - with: - host: ${{secrets.HOST}} - username: ubuntu - key: ${{secrets.PEM_KEY}} - script: | - sudo docker pull ${{secrets.DOCKER_USERNAME}}/gachontable:latest - - EXISTING_CONTAINER_ID=$(sudo docker ps -q -f "publish=8080" -f "status=running") - if [ ! -z "$EXISTING_CONTAINER_ID" ]; then - sudo docker stop $EXISTING_CONTAINER_ID - sudo docker rm $EXISTING_CONTAINER_ID - fi - - EXISTING_CONTAINER_ID=$(sudo docker ps -q -f "publish=8080" -f "status=exited") - if [ ! -z "$EXISTING_CONTAINER_ID" ]; then - sudo docker rm $EXISTING_CONTAINER_ID - fi - - sudo docker rm $(sudo docker ps --filter 'status=exited' -a -q) - sudo docker run -d -v /home/ubuntu/pinpoint-agent-2.5.3:/pinpoint-agent --log-driver=syslog --name lupg -p 8080:8080 -p 63544:63544 -e JAVA_OPTS=-Djasypt.encryptor.password=${{secrets.JASYPT_ENCRYPTOR_PASSWORD}} ${{secrets.DOCKER_USERNAME}}/gachontable:latest - sudo docker image prune -a -f diff --git a/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/CallUser.java b/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/CallUser.java index 2e667b8..21fd09b 100644 --- a/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/CallUser.java +++ b/src/main/java/site/gachontable/gachontablebe/domain/admin/usecase/CallUser.java @@ -31,7 +31,7 @@ public class CallUser { private final AdminRepository adminRepository; private final SendBiztalk sendBiztalk; private final AutoCancelUser autoCancelUser; - private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4); + private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(8); @Value("${biztalk.templateId.call}") private String CALL_TEMPLATE_CODE; diff --git a/src/main/java/site/gachontable/gachontablebe/global/config/async/AsyncConfiguration.java b/src/main/java/site/gachontable/gachontablebe/global/config/async/AsyncConfiguration.java index 31137e8..b881733 100644 --- a/src/main/java/site/gachontable/gachontablebe/global/config/async/AsyncConfiguration.java +++ b/src/main/java/site/gachontable/gachontablebe/global/config/async/AsyncConfiguration.java @@ -14,9 +14,9 @@ public class AsyncConfiguration { @Bean public Executor taskExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(4); - executor.setMaxPoolSize(6); - executor.setQueueCapacity(500); + executor.setCorePoolSize(8); + executor.setMaxPoolSize(16); + executor.setQueueCapacity(1000); executor.setThreadNamePrefix("Biztalk"); executor.initialize(); return executor; diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml index c2ba19d..df79548 100644 --- a/src/main/resources/application-prod.yaml +++ b/src/main/resources/application-prod.yaml @@ -6,26 +6,26 @@ spring: username: ENC(Z89GsautuOl2p6BefL146A==) password: ENC(4IWCgJuGPqbikO4xgN8jZRekUWDhUoyuafdh60pKN5M=) driver-class-name: com.mysql.cj.jdbc.Driver - maximum-pool-size: 10 - connection-timeout: 5000 + maximum-pool-size: 33 + connection-timeout: 3000 connection-init-sql: SELECT 1 validation-timeout: 2000 minimum-idle: 10 - idle-timeout: 600000 - max-lifetime: 1800000 + idle-timeout: 300000 + max-lifetime: 1200000 slave: hikari: jdbc-url: ENC(Ux6HWzhKveQtR3WOyTmA/qad//VpWjpNRpFLSdL7Rh1Y7uO7u3jBwLND6IyjI+HTaoLbXqGj/qX7830f1oBRiDndgHIxzOz9ftCwWHc4TioG9MsIEmGrxKGo7ylSyAW3z0VcUGjLQsVAZRyk9s6kKOdQnEZeZfWO+ACPHcPlG/KOfaqWlz3kl/N13hRNKaiIW8I/vo5aV8KDbrNkJhKT8PN5GDu9+TkYKS0iSt9TzrcseBW96MzgYg==) username: ENC(Z89GsautuOl2p6BefL146A==) password: ENC(4IWCgJuGPqbikO4xgN8jZRekUWDhUoyuafdh60pKN5M=) driver-class-name: com.mysql.cj.jdbc.Driver - maximum-pool-size: 10 - connection-timeout: 5000 + maximum-pool-size: 33 + connection-timeout: 3000 connection-init-sql: SELECT 1 validation-timeout: 2000 minimum-idle: 10 - idle-timeout: 600000 - max-lifetime: 1800000 + idle-timeout: 300000 + max-lifetime: 1200000 jpa: show-sql: false