From 21aed4d6e84f8a16c78f190a0059a803a5e19f52 Mon Sep 17 00:00:00 2001 From: carter-sw <6k2hbc@gmail.com> Date: Thu, 30 May 2024 23:05:53 +0900 Subject: [PATCH] A --- ...Checkout_at_2024-05-20__7_41__Changes_.xml | 4 - .../shelved.patch" | 860 ------------------ .idea/workspace.xml | 7 - 3 files changed, 871 deletions(-) delete mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20__7_41__Changes_.xml delete mode 100644 ".idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20_\354\230\244\355\233\204_7_41_[Changes]/shelved.patch" diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20__7_41__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20__7_41__Changes_.xml deleted file mode 100644 index 4da8b57..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20__7_41__Changes_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20_\354\230\244\355\233\204_7_41_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20_\354\230\244\355\233\204_7_41_[Changes]/shelved.patch" deleted file mode 100644 index 14cf557..0000000 --- "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2024-05-20_\354\230\244\355\233\204_7_41_[Changes]/shelved.patch" +++ /dev/null @@ -1,860 +0,0 @@ -Index: .idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch -=================================================================== -diff --git a/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch b/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch -deleted file mode 100644 ---- a/.idea/shelf/Uncommitted_changes_before_rebase_[Changes]1/shelved.patch (revision f9c9120b29dfc4c9fcbc40649ecf47735b856505) -+++ /dev/null (revision f9c9120b29dfc4c9fcbc40649ecf47735b856505) -@@ -1,459 +0,0 @@ --Index: scripts/start.sh --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP --<+>#!/bin/bash\r\n\r\nROOT_PATH=\"/home/ec2-user/spring\"\r\nJAR= \"$ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar # 내 ec2 파일 위치\r\nAPP_LOG=\"$ROOT_PATH/application.log\"\r\nERROR_LOG=\"$ROOT_PATH/error.log\"\r\nSTART_LOG=\"$ROOT_PATH/start.log\"\r\n\r\nNOW=$(date +%c)\r\n\r\necho \"[$NOW] $JAR 복사\" >> $START_LOG\r\ncp $ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar $JAR\r\n\r\necho \"[$NOW] > $JAR 실행\" >> $START_LOG\r\nnohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG &\r\n\r\nSERVICE_PID=$(pgrep -f $JAR)\r\necho \"[$NOW] > 서비스 PID: $SERVICE_PID\" >> $START_LOG --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/scripts/start.sh b/scripts/start.sh ----- a/scripts/start.sh (revision c890fe5580ae0f51e3d8bd01f509600fa6213ec6) --+++ b/scripts/start.sh (date 1715514241960) --@@ -1,7 +1,7 @@ -- #!/bin/bash -- -- ROOT_PATH="/home/ec2-user/spring" ---JAR= "$ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar # 내 ec2 파일 위치 --+JAR="$ROOT_PATH/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar" # 수정된 경로 -- APP_LOG="$ROOT_PATH/application.log" -- ERROR_LOG="$ROOT_PATH/error.log" -- START_LOG="$ROOT_PATH/start.log" --@@ -9,10 +9,10 @@ -- NOW=$(date +%c) -- -- echo "[$NOW] $JAR 복사" >> $START_LOG ---cp $ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar $JAR --+cp $JAR $ROOT_PATH -- -- echo "[$NOW] > $JAR 실행" >> $START_LOG -- nohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG & -- -- SERVICE_PID=$(pgrep -f $JAR) ---echo "[$NOW] > 서비스 PID: $SERVICE_PID" >> $START_LOG --\ No newline at end of file --+echo "[$NOW] > 서비스 PID: $SERVICE_PID" >> $START_LOG --Index: scripts/stop.sh --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP --<+>#!/bin/bash\r\n\r\nROOT_PATH=\"/home/ec2-user/spring\"\r\nJAR=\"$ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar\" # 내 ec2 파일 위치\r\nSTOP_LOG=\"$ROOT_PATH/stop.log\"\r\nSERVICE_PID=$(pgrep -f $JAR) # 실행중인 Spring 서버의 PID\r\n\r\nif [ -z \"$SERVICE_PID\" ]; then\r\n echo \"서비스 NotFound\" >> $STOP_LOG\r\nelse\r\n echo \"서비스 종료 \" >> $STOP_LOG\r\n kill \"$SERVICE_PID\"\r\n # kill -9 $SERVICE_PID # 강제 종료를 하고 싶다면 이 명령어 사용\r\nfi --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/scripts/stop.sh b/scripts/stop.sh ----- a/scripts/stop.sh (revision c890fe5580ae0f51e3d8bd01f509600fa6213ec6) --+++ b/scripts/stop.sh (date 1715514249419) --@@ -1,7 +1,7 @@ -- #!/bin/bash -- -- ROOT_PATH="/home/ec2-user/spring" ---JAR="$ROOT_PATH/home/ec2-user/spring/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar" # 내 ec2 파일 위치 --+JAR="$ROOT_PATH/build/libs/be-3rd-project-0.0.1-SNAPSHOT.jar" # 수정된 경로 -- STOP_LOG="$ROOT_PATH/stop.log" -- SERVICE_PID=$(pgrep -f $JAR) # 실행중인 Spring 서버의 PID -- --@@ -11,4 +11,4 @@ -- echo "서비스 종료 " >> $STOP_LOG -- kill "$SERVICE_PID" -- # kill -9 $SERVICE_PID # 강제 종료를 하고 싶다면 이 명령어 사용 ---fi --\ No newline at end of file --+fi --Index: .idea/compiler.xml --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP --<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/.idea/compiler.xml b/.idea/compiler.xml ----- a/.idea/compiler.xml (revision c890fe5580ae0f51e3d8bd01f509600fa6213ec6) --+++ b/.idea/compiler.xml (date 1715512291642) --@@ -8,8 +8,12 @@ -- -- -- --- --+ -- -- --+ --+ --+ --+ -- -- --\ No newline at end of file --Index: .idea/workspace.xml --IDEA additional info: --Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP --<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n --Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP --<+>UTF-8 --=================================================================== --diff --git a/.idea/workspace.xml b/.idea/workspace.xml ----- a/.idea/workspace.xml (revision c890fe5580ae0f51e3d8bd01f509600fa6213ec6) --+++ b/.idea/workspace.xml (date 1715513461707) --@@ -4,16 +4,11 @@ --