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
12 changes: 6 additions & 6 deletions .github/workflows/deploy-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
echo "DB_USER=${{ secrets.DB_USER }}" >> .env.prod
echo "DB_PASS=${{ secrets.DB_PASS }}" >> .env.prod
echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env.prod
echo "ENV_NAME=${{ secrets.LOKI_URL }}" >> .env.prod
echo "ENV_NAME=${{ secrets.LOKI_USERNAME }}" >> .env.prod
echo "ENV_NAME=${{ secrets.LOKI_PASSWORD }}" >> .env.prod
echo "LOKI_URL=${{ secrets.LOKI_URL }}" >> .env.prod
echo "LOKI_USERNAME=${{ secrets.LOKI_USERNAME }}" >> .env.prod
echo "LOKI_PASSWORD=${{ secrets.LOKI_PASSWORD }}" >> .env.prod
echo "ENV_NAME=${{ secrets.ENV_NAME }}" >> .env.prod

- name: Set repo lowercase
Expand All @@ -44,6 +44,7 @@ jobs:
key: ${{ secrets.SERVER_SSH_KEY }}
source: "docker/production/docker-compose.yml"
target: "~/app"
overwrite: true

- name: Copy .env.prod file to EC2
uses: appleboy/scp-action@v0.1.7
Expand All @@ -62,7 +63,7 @@ jobs:
username: ubuntu
key: ${{ secrets.SERVER_SSH_KEY }}
source: "docker/production/Caddyfile"
target: "~/app/docker/production/"
target: "~/app"
overwrite: true

- name: Copy promtail-config to EC2
Expand All @@ -72,8 +73,7 @@ jobs:
username: ubuntu
key: ${{ secrets.SERVER_SSH_KEY }}
source: "docker/production/promtail-config.yml"
target: "~/app/docker/production/promtail-config.yml"
overwrite: true
target: "~/app"


- name: Deploy on EC2
Expand Down
34 changes: 0 additions & 34 deletions apps/user-service/src/main/resources/log4j2-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,6 @@ Configuration:
PatternLayout:
pattern: ${console-layout-pattern}

# Loki Appender - 프로덕션 모니터링용
Loki:
name: loki-appender
url: ${LOKI_URL} # Grafana Cloud Loki URL
basicAuthUsername: ${LOKI_USERNAME} # Grafana Cloud 사용자 이름
basicAuthPassword: ${LOKI_PASSWORD} # Grafana Cloud API Key
JsonLayout:
compact: true
eventEol: true
includeStacktrace: true
KeyValuePair:
- key: "app"
value: "${app-name}"
- key: "env"
value: "production"
Label:
- name: "app"
value: "${app-name}"
- name: "env"
value: "production"
- name: "traceId"
value: "${ctx:traceId}"
- name: "spanId"
value: "${ctx:spanId}"
- name: "executionType"
value: "${ctx:executionType:-application}"
- name: "sourceId"
value: "${ctx:sourceId}"
- name: "runId"
value: "${ctx:runId}"

JDBC:
name: workflow-appender
tableName: "execution_log"
Expand Down Expand Up @@ -135,7 +104,6 @@ Configuration:
level: INFO
AppenderRef:
- ref: console-appender
- ref: loki-appender
- ref: file-prod-appender
- ref: file-error-appender

Expand All @@ -144,7 +112,6 @@ Configuration:
additivity: "false"
AppenderRef:
- ref: workflow-appender
- ref: loki-appender
- ref: console-appender
- ref: file-prod-appender
- ref: file-error-appender
Expand Down Expand Up @@ -172,7 +139,6 @@ Configuration:
AppenderRef:
- ref: console-appender
- ref: file-prod-appender
- ref: loki-appender

# 트랜잭션 로그 - 프로덕션에서는 WARN 레벨
- name: org.springframework.transaction
Expand Down
Loading