From 6c286bfebe4149346592a45c4940b6865ea40d0b Mon Sep 17 00:00:00 2001 From: Jeremy <102432453+shackstack@users.noreply.github.com> Date: Fri, 29 Dec 2023 17:39:27 +0900 Subject: [PATCH] =?UTF-8?q?release:=20=EB=B0=B1=EC=97=94=EB=93=9C=20v4.1?= =?UTF-8?q?=20(#669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * graceful-test * graceful-test2 * chore: own 설정 추가 * chore: own 설정 수정 * chore: logback 설정 수정 * Update backend-dev-cd.yml (#657) --------- Co-authored-by: TaeyeonRoyce Co-authored-by: Taeyeon <90550065+TaeyeonRoyce@users.noreply.github.com> --- .github/workflows/backend-dev-cd.yml | 3 ++- backend/backend-submodule | 2 +- .../com/celuveat/celeb/presentation/CelebController.java | 6 ++++++ backend/src/main/resources/logback-spring.xml | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend-dev-cd.yml b/.github/workflows/backend-dev-cd.yml index 22e69d5f4..1539590a2 100644 --- a/.github/workflows/backend-dev-cd.yml +++ b/.github/workflows/backend-dev-cd.yml @@ -76,4 +76,5 @@ jobs: run: | export APP_VERSION_TAG=${{ secrets.APP_VERSION_TAG }} pwd - sh /home/ubuntu/deploy.sh + docker compose down + docker compose up -d diff --git a/backend/backend-submodule b/backend/backend-submodule index e5e0f2a99..5839c1728 160000 --- a/backend/backend-submodule +++ b/backend/backend-submodule @@ -1 +1 @@ -Subproject commit e5e0f2a999ac32913b6de1c4bd320ae663542076 +Subproject commit 5839c17280f69f94357e4c5cc3982dda611931c2 diff --git a/backend/src/main/java/com/celuveat/celeb/presentation/CelebController.java b/backend/src/main/java/com/celuveat/celeb/presentation/CelebController.java index 64dc49246..138c14c1b 100644 --- a/backend/src/main/java/com/celuveat/celeb/presentation/CelebController.java +++ b/backend/src/main/java/com/celuveat/celeb/presentation/CelebController.java @@ -21,4 +21,10 @@ ResponseEntity> find() { List result = celebQueryService.find(); return ResponseEntity.ok(result); } + + @GetMapping("/test") + ResponseEntity test() throws InterruptedException { + Thread.sleep(10000); + return ResponseEntity.ok().build(); + } } diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml index 70e92a931..051f24f0c 100644 --- a/backend/src/main/resources/logback-spring.xml +++ b/backend/src/main/resources/logback-spring.xml @@ -15,7 +15,7 @@ - +