zjcqoo 6 лет назад
Родитель
Сommit
0b0556b262
2 измененных файлов с 18 добавлено и 11 удалено
  1. 3 3
      log-svc/backup.sh
  2. 15 8
      upload.sh

+ 3 - 3
log-svc/backup.sh

@@ -5,10 +5,10 @@ SVC_DIR=/home/jsproxy/server
 LOG_DIR=$SVC_DIR/nginx/logs
 
 LOG_FILE=$LOG_DIR/proxy.log
-LOG_SIZE=$(( 1024 * 1024 * 1024 ))
+LOG_SIZE=$(( 256 * 1024 * 1024 ))
 
 ERR_FILE=$LOG_DIR/error.log
-ERR_SIZE=$(( 1 * 1024 * 1024 * 1024 ))
+ERR_SIZE=$(( 256 * 1024 * 1024 ))
 
 
 # error.log 达到 ERR_SIZE,开始备份(目前只清理)
@@ -41,6 +41,6 @@ sleep 1
 echo "compress $logtime ($logsize bytes)"
 
 nice -n 19 \
-  xz -9 *.log
+  xz -9 backup/*.log
 
 echo "done"

+ 15 - 8
upload.sh

@@ -11,20 +11,27 @@ NODE=(
   aliyun-sg
 )
 for v in ${NODE[@]}; do
-  echo "$v upload ..."
-  rsync . jsproxy@$v.$HOST:server \
-    -a \
-    --exclude='nginx/cache/*' \
-    --exclude='nginx/logs/*'
+  # echo "$v upload ..."
+  # rsync . jsproxy@$v.$HOST:server \
+  #   -a \
+  #   --exclude='nginx/cache/*' \
+  #   --exclude='nginx/logs/*'
+
 
   # echo "$v reload nginx ..."
   # 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 | cut -d' ' -f 4)"
+
+  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 &"
+  # ssh jsproxy@$v.$HOST "./server/log-svc/svc.sh &"
+
+
+  # echo "$v update www"
+  # ssh jsproxy@$v.$HOST "cd server/www && git pull"
 done
 
 echo "done"