From 7cc4acee89ffe7d603a28f360e02d3d2ed03466c Mon Sep 17 00:00:00 2001 From: hojinida Date: Tue, 22 Oct 2024 00:00:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-api/src/main/resources/application.yml | 2 ++ core/core-domain/build.gradle.kts | 1 - .../myongjiway/core/domain/buslocation/BusLocationService.kt | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/core-api/src/main/resources/application.yml b/core/core-api/src/main/resources/application.yml index be1253b..b71a025 100644 --- a/core/core-api/src/main/resources/application.yml +++ b/core/core-api/src/main/resources/application.yml @@ -19,6 +19,8 @@ server: threads: max: 600 min-spare: 100 + max-keep-alive-requests: 1000 + keep-alive-timeout: 30000 --- spring.config.activate.on-profile: local diff --git a/core/core-domain/build.gradle.kts b/core/core-domain/build.gradle.kts index 07a501e..0bb1556 100644 --- a/core/core-domain/build.gradle.kts +++ b/core/core-domain/build.gradle.kts @@ -1,6 +1,5 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter") - // JWT api("io.jsonwebtoken:jjwt-api:0.12.6") api("io.jsonwebtoken:jjwt-impl:0.12.6") diff --git a/core/core-domain/src/main/kotlin/com/myongjiway/core/domain/buslocation/BusLocationService.kt b/core/core-domain/src/main/kotlin/com/myongjiway/core/domain/buslocation/BusLocationService.kt index 174a8e0..cff3d33 100644 --- a/core/core-domain/src/main/kotlin/com/myongjiway/core/domain/buslocation/BusLocationService.kt +++ b/core/core-domain/src/main/kotlin/com/myongjiway/core/domain/buslocation/BusLocationService.kt @@ -24,7 +24,5 @@ class BusLocationService { * * @return 모든 버스의 위치 정보 리스트 */ - fun getBusLocations(): List { - return busLocationMap.values.toList() - } + fun getBusLocations(): List = busLocationMap.values.toList() } From 56fc7fd3640a952b8dca596771481616ac9bc3a3 Mon Sep 17 00:00:00 2001 From: hojinida Date: Tue, 22 Oct 2024 03:19:25 +0900 Subject: [PATCH 2/2] test --- .github/workflows/cd.yml | 2 +- storage/db-core/src/main/resources/db-core.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3b6f6fd..57f9697 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -104,7 +104,7 @@ jobs: docker pull ${{ secrets.DOCKER_USERNAME }}/dev:latest docker stop app || true docker rm app || true - docker run -d --name app --network monitoring -p 8080:8080 \ + docker run -d --name app --network host \ --env-file /home/ubuntu/.env \ -v /home/ubuntu/cert:/cert \ -v /var/logs:/logs \ diff --git a/storage/db-core/src/main/resources/db-core.yml b/storage/db-core/src/main/resources/db-core.yml index be71269..1fac963 100644 --- a/storage/db-core/src/main/resources/db-core.yml +++ b/storage/db-core/src/main/resources/db-core.yml @@ -137,7 +137,8 @@ storage: jdbc-url: jdbc:mysql://${STORAGE_DATABASE_CORE_DB_URL} username: ${STORAGE_DATABASE_CORE_DB_USERNAME} password: ${STORAGE_DATABASE_CORE_DB_PASSWORD} - maximum-pool-size: 25 + maximum-pool-size: 150 + minimum-idle: 100 connection-timeout: 1100 keepalive-time: 30000 validation-timeout: 1000