Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ dependencies {
implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'com.github.loki4j:loki-logback-appender:1.6.0'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
implementation 'org.redisson:redisson-spring-boot-starter:4.3.1'
compileOnly 'org.projectlombok:lombok'
Expand All @@ -63,4 +62,4 @@ dependencies {

tasks.named('test') {
useJUnitPlatform()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CreateBoardDto(Long userId, ReqCreateBoardDto reqCreateBoardDto, Multipar
this.category = Category.values()[reqCreateBoardDto.getCategory()];
this.imageUrls = reqCreateBoardDto.getImageUrls();
this.file = file;
this.tagNames = reqCreateBoardDto.getTagNames();
this.tagNames = reqCreateBoardDto.getTags();
}

public CreateBoardDto(Board board) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public UpdateBoardDto(Long userId, Long boardId, ReqUpdateBoardDto reqUpdateBoar
this.imageUrls = reqUpdateBoardDto.getImageUrls();
this.file = file;
this.isChangedFile = reqUpdateBoardDto.getIsChangedFile();
this.tagNames = reqUpdateBoardDto.getTagNames();
this.tagNames = reqUpdateBoardDto.getTags();
}

public UpdateBoardDto(Board board) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.handong.cra.crawebbackend.board.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;

Expand All @@ -24,6 +23,6 @@ public class ReqCreateBoardDto {

private List<String> imageUrls;

private List<String> tagNames;
private List<String> tags;

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.handong.cra.crawebbackend.board.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

import java.util.List;
Expand All @@ -15,5 +14,5 @@ public class ReqUpdateBoardDto {
private List<String> imageUrls;
private Boolean isChangedFile;
private Boolean deleted;
private List<String> tagNames;
private List<String> tags;
}
27 changes: 1 addition & 26 deletions src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,36 +71,11 @@
</appender>

<springProfile name="deploy">
<springProperty scope="context" name="LOKI_URL" source="logging.loki.url" defaultValue="http://localhost:3100"/>

<appender name="LOKI" class="com.github.loki4j.logback.Loki4jAppender">
<http>
<url>${LOKI_URL}/loki/api/v1/push</url>
<connectTimeoutMs>1000</connectTimeoutMs>
<requestTimeoutMs>1500</requestTimeoutMs>
<maxRetries>1</maxRetries>
</http>
<format>
<label>
<pattern>app=craweb,host=${HOSTNAME:-unknown}</pattern>
</label>
<message class="com.github.loki4j.logback.JsonLayout"/>
</format>
</appender>

<appender name="ASYNC-LOKI" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="LOKI"/>
<queueSize>8192</queueSize>
<discardingThreshold>0</discardingThreshold>
<neverBlock>true</neverBlock>
</appender>

<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="ASYNC-FILE"/>
<appender-ref ref="ASYNC-FILE-ERROR"/>
<appender-ref ref="ASYNC-FILE-WARN"/>
<appender-ref ref="ASYNC-LOKI"/>
</root>
</springProfile>

Expand All @@ -113,4 +88,4 @@
</root>
</springProfile>

</configuration>
</configuration>
Loading