update

log-svc/backup.sh

@@ -3,6 +3,7 @@
 
 SVC_DIR=/home/jsproxy/server
 LOG_DIR=$SVC_DIR/nginx/logs
+DST_DIR=$SVC_DIR/log-svc/backup
 
 LOG_FILE=$LOG_DIR/proxy.log
 LOG_SIZE=$(( 256 * 1024 * 1024 ))
@@ -24,12 +25,11 @@ if (( $logsize < $LOG_SIZE )); then
 fi
 
 logtime=$(date "+%Y-%m-%d-%H-%M-%S")
-logfile=$SVC_DIR/log-svc/backup/$logtime.log
 
 #
 # 先移走日志文件，然后创建新的日志文件，通知 nginx 重新打开
 #
-mv $LOG_FILE $logfile
+mv $LOG_FILE $DST_DIR/$logtime.log
 touch $LOG_FILE
 $SVC_DIR/run.sh reopen
 sleep 1
@@ -38,9 +38,8 @@ sleep 1
 # 日志压缩
 # 根据实际情况调整策略，在不影响系统的前提下，充分利用剩余 CPU
 #
-echo "compress $logtime ($logsize bytes)"
+echo "compress ..."
 
-nice -n 19 \
-  xz -9 backup/*.log
+nice -n 19 xz $DST_DIR/*.log
 
 echo "done"

upload.sh

@@ -22,13 +22,11 @@ for v in ${NODE[@]}; do
   # ssh jsproxy@$v.$HOST "./server/run.sh reload"
 
 
-  echo "$v kill log-svc.sh"
-  ssh jsproxy@$v.$HOST "kill $(ps aux | grep svc.sh | head -n1 | awk '{print $2}')"
-
-
-  # echo "$v run log-svc.sh"
-  # ssh jsproxy@$v.$HOST "./server/log-svc/svc.sh &"
-
+  echo "$v reload svc.sh"
+  ssh jsproxy@$v.$HOST << EOF
+pkill -f svc.sh
+./server/log-svc/svc.sh &
+EOF
 
   # echo "$v update www"
   # ssh jsproxy@$v.$HOST "cd server/www && git pull"