Skip to content

Commit 09fd6b4

Browse files
committed
fix: 병합 해결
1 parent 9f53300 commit 09fd6b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+999
-72
lines changed

.DS_Store

6 KB
Binary file not shown.

build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ dependencies {
4747

4848
//redis
4949
implementation("org.springframework.boot:spring-boot-starter-data-redis")
50+
implementation("org.springframework.session:spring-session-data-redis")
51+
52+
// actuator
53+
implementation("org.springframework.boot:spring-boot-starter-actuator")
5054

5155
// Security
5256
implementation("org.springframework.boot:spring-boot-starter-security")
@@ -62,6 +66,8 @@ dependencies {
6266
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")
6367
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
6468

69+
// WebClient
70+
implementation ("org.springframework.boot:spring-boot-starter-webflux")
6571
}
6672

6773
tasks.withType<Test> {

infraScript/zero_downtime_deploy.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,15 @@ def _is_service_up(self, port: int) -> bool:
6969
response = requests.get(url, timeout=5) # 5초 이내 응답 없으면 예외 발생
7070
if response.status_code == 200 and response.json().get('status') == 'UP':
7171
return True
72-
except requests.RequestException:
73-
pass
72+
except requests.RequestException as e:
73+
print(f"Request failed: {e}")
74+
# `response` 객체가 존재한다면 응답 본문 출력
75+
if 'response' in locals():
76+
print(f"Invalid JSON response: {response.text}")
77+
else:
78+
print("No response received.")
79+
except ValueError as e:
80+
print(f"JSON parsing failed: {e}")
7481
return False
7582

7683
# 서비스를 업데이트하는 함수

src/.DS_Store

6 KB
Binary file not shown.

src/main/.DS_Store

6 KB
Binary file not shown.

src/main/java/.DS_Store

6 KB
Binary file not shown.

src/main/java/cmf/.DS_Store

6 KB
Binary file not shown.
6 KB
Binary file not shown.
6 KB
Binary file not shown.

src/main/java/cmf/commitField/domain/chat/chatMessage/entity/ChatMessage.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
import lombok.AllArgsConstructor;
1111
import lombok.Getter;
1212
import lombok.NoArgsConstructor;
13+
import lombok.experimental.SuperBuilder;
1314

1415
import java.time.LocalDateTime;
1516

1617
@Entity
18+
@SuperBuilder
1719
@Getter
1820
@NoArgsConstructor
1921
@AllArgsConstructor

0 commit comments

Comments
 (0)