Merge pull request #506 from woowacourse-teams/refactor/logback_dev

dev 서버의 로그 저장소 변경
woowacourse-teams · Aug 20, 2024 · 26ca6b9 · 26ca6b9
2 parents bd1b8df + 1f79652
commit 26ca6b9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 70 deletions.
diff --git a/.github/workflows/backend_cd.yml b/.github/workflows/backend_cd.yml
@@ -3,53 +3,40 @@ name: Backend CD
 on:
   push:
     branches:
+      - main
       - dev/be
 
 jobs:
   build:
-    runs-on: [self-hosted, develop, spring]
+    runs-on:
+      - self-hosted
+      - spring
+      - ${{ contains(github.ref, 'main') && 'production' || 'develop' }}
     steps:
-      - name: 브랜치명을 통해 개발 환경 알아내기
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash find-env-by-branch.sh
-          
       - name: 체크아웃
         uses: actions/checkout@v4
-        
+
       - name: gradle 캐싱
         uses: gradle/actions/setup-gradle@v3
-            
+
       - name: bootJar로 jar 파일 생성
         run: |
           ./gradlew bootJar
-          mv build/libs/*.jar ${{ secrets.WORK_DIRECTORY }}/${{ env.ENVIRONMENT }}
+          mv build/libs/*.jar ${{ secrets.JAR_DIRECTORY }}
         working-directory: ./backend
-      
+
       - name: 클린업
         if: always()
         run: rm -rf ../2024-code-zap/*
-        
+
   deploy:
     needs: build
-    runs-on: [self-hosted, develop, spring]
+    runs-on:
+      - self-hosted
+      - spring
+      - ${{ contains(github.ref, 'main') && 'production' || 'develop' }}
     steps:
-      - name: 브랜치명을 통해 개발 환경 알아내기
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash find-env-by-branch.sh
-          
-      - name: 실행 프로세스 확인
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash check-old-pids.sh
-        
       - name: 배포 스크립트 실행
         run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          RUNNER_TRACKING_ID="" && bash start.sh ${{ env.ENVIRONMENT }}
-                    
-      - name: 실행 프로세스 확인으로 배포 검증 
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash verify-deploy.sh
+          cd ${{ secrets.ZAP_DIRECTORY }}
+          docker compose restart
diff --git a/.github/workflows/backend_cd_prod.yml b/.github/workflows/backend_cd_prod.yml
diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml
@@ -7,11 +7,7 @@
         <include resource="logger/logback-spring-local.xml"/>
     </springProfile>
 
-    <springProfile name="dev-1">
-        <include resource="logger/logback-spring-dev.xml"/>
-    </springProfile>
-
-    <springProfile name="dev-2">
+    <springProfile name="dev">
         <include resource="logger/logback-spring-dev.xml"/>
     </springProfile>
 

diff --git a/backend/src/main/resources/logger/logback-spring-dev.xml b/backend/src/main/resources/logger/logback-spring-dev.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="5 seconds">
 
-    <property name="LOG_FILE_PATH" value="/home/ubuntu/srv/code-zap/dev/spring-log/"/>
+    <property name="LOG_FILE_PATH" value="/app/log"/>
 
     <include resource="logger/file/info-appender.xml"/>
     <include resource="logger/file/warn-appender.xml"/>