Skip to content

Commit

Permalink
feat: submodule 업데이트 및 설정 분리
Browse files Browse the repository at this point in the history
  • Loading branch information
hjk0761 committed Aug 14, 2024
1 parent 54bf625 commit 8674109
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 7 deletions.
2 changes: 1 addition & 1 deletion backend/scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ nohup java -Duser.timezone=Asia/Seoul \
-Dfile.encoding=UTF-8 \
-Xms1G \
-Xmx1G \
-jar $APPLICATION_JAR > /dev/null 2> /dev/null < /dev/null &
-jar -Dspring.profiles.active=dev $APPLICATION_JAR > /dev/null 2> /dev/null < /dev/null &
6 changes: 1 addition & 5 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
spring:
profiles:
group:
dev: dev, secret
test: test
local: local, secret
active: local

config:
import: ./corea-prod/application-secret.yml
import: ./corea-prod/application-dev.yml, ./corea-prod/application-local.yml, ./corea-prod/application-prod.yml
2 changes: 1 addition & 1 deletion backend/src/main/resources/corea-prod
43 changes: 43 additions & 0 deletions backend/src/main/resources/test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!--<?xml version="1.0" encoding="UTF-8"?>-->

<!--<configuration>-->
<!-- <property name="FILE_LOG_PATTERN"-->
<!-- value="[%d{yyyy-MM-dd HH:mm:ss}:%-4relative] [%thread] %-5level - [%X{requestId}] - %msg %ex{5}%n"/>-->
<!-- <property name="CONSOLE_LOG_PATTERN"-->
<!-- value="[%d{yyyy-MM-dd HH:mm:ss}:%-4relative] %green([%thread]) %highlight(%-5level) %boldWhite([%C.%M:%yellow(%L)]) - %msg %ex{5}%n"/>-->
<!-- <property name="LOG_PATH"-->
<!-- value="logs/backend"/>-->

<!-- <springProfile name="local">-->
<!-- <include resource="logs/console-appender.xml"/>-->

<!-- <logger name="corea" level="DEBUG" additivity="false">-->
<!-- <appender-ref ref="CONSOLE"/>-->
<!-- </logger>-->

<!-- <logger name="corea" level="INFO" additivity="false">-->
<!-- <appender-ref ref="CONSOLE"/>-->
<!-- </logger>-->
<!-- <logger name="root" level="ERROR" additivity="false">-->
<!-- <appender-ref ref="CONSOLE"/>-->
<!-- </logger>-->
<!-- </springProfile>-->

<!-- <springProfile name="dev">-->
<!-- <include resource="logs/file-debug-appender.xml"/>-->

<!-- <include resource="logs/file-info-appender.xml"/>-->
<!-- <include resource="logs/file-warn-appender.xml"/>-->
<!-- <include resource="logs/file-error-appender.xml"/>-->

<!-- <logger name="corea" level="DEBUG" additivity="false">-->
<!-- <appender-ref ref="FILE-DEBUG"/>-->
<!-- </logger>-->

<!-- <logger name="corea" level="INFO" additivity="false">-->
<!-- <appender-ref ref="FILE-INFO"/>-->
<!-- <appender-ref ref="FILE-WARN"/>-->
<!-- <appender-ref ref="FILE-ERROR"/>-->
<!-- </logger>-->
<!-- </springProfile>-->
<!--</configuration>-->

0 comments on commit 8674109

Please sign in to comment.