wangkun 2 tahun lalu
induk
melakukan
2a71b51f6d
2 mengubah file dengan 25 tambahan dan 21 penghapusan
  1. 2 3
      README.MD
  2. 23 18
      main/process_offline.sh

+ 2 - 3
README.MD

@@ -200,10 +200,9 @@ ps aux | grep run_suisuiniannianyingfuqi | grep -v grep | awk '{print $2}' | xar
 #### 刚刚都传小程序
 ```commandline
 MacAir 设备, crontab定时任务
-* * * * * /bin/sh /Users/piaoquan/Desktop/piaoquan_crawler/main/process_offline.sh "offline"
+* * * * * /bin/sh /Users/piaoquan/Desktop/piaoquan_crawler/main/process_offline.sh "prod"
 线下调试
-cd /Users/wangkun/Desktop/crawler/piaoquan_crawler
-sh ./main/process_offline.sh "dev"
+sh /Users/wangkun/Desktop/crawler/piaoquan_crawler/main/process_offline.sh "dev"
 检测进程
 ps aux | grep run_ganggangdouchuan
 ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9

+ 23 - 18
main/process_offline.sh

@@ -1,19 +1,17 @@
 #! /bin/bash
 # **********线下爬虫********** #
 
-env=$1  # 环境
-#echo ${env}
-
+env=$1          # 爬虫运行环境,正式环境: prod / 测试环境: dev
+echo ${env}
 if [ ${env} = "dev" ];then
   piaoquan_crawler_dir=/Users/wangkun/Desktop/crawler/piaoquan_crawler/
   profile_path=/etc/profile
-  python=python3
+  node_path=/opt/homebrew/bin/node
   log_path=${piaoquan_crawler_dir}main/main_logs/process-$(date +%Y-%m-%d).log
 else
   piaoquan_crawler_dir=/Users/piaoquan/Desktop/piaoquan_crawler/
-#  profile_path=/etc/profile
   profile_path=./base_profile
-  python=python3
+  node_path=/usr/local/bin/node
   log_path=${piaoquan_crawler_dir}main/main_logs/process-$(date +%Y-%m-%d).log
 fi
 
@@ -22,6 +20,16 @@ echo "$(date "+%Y-%m-%d %H:%M:%S") 更新环境变量..." >> ${log_path}
 cd ~ && source ${profile_path}
 echo "$(date "+%Y-%m-%d %H:%M:%S") 更新环境变量完成!" >> ${log_path}
 
+echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启Appium..." >> ${log_path}
+ps -ef | grep "/Applications/Appium.app/Contents/Resources/app/node_modules/appium/build/lib/main.js" | grep -v "grep"
+if [ "$?" -eq 1 ];then
+  echo "$(date "+%Y-%m-%d_%H:%M:%S") Appium异常停止,正在重启!" >> ${log_path}
+  nohup ${node_path} /Applications/Appium.app/Contents/Resources/app/node_modules/appium/build/lib/main.js >>./nohup.log 2>&1 &
+else
+  echo "$(date "+%Y-%m-%d %H:%M:%S") Appium 进程状态正常" >> ${log_path}
+fi
+echo "$(date "+%Y-%m-%d %H:%M:%S") 重启Appium完毕!" >> ${log_path}
+
 ## 吉祥幸福
 #if [[ "$time" > "00:00:0" ]] && [[ "$time" < "08:59:59" ]]; then
 #  echo "开始启动 吉祥幸福 爬虫脚本任务" >> ${log_path}
@@ -53,25 +61,22 @@ echo "$(date "+%Y-%m-%d %H:%M:%S") 更新环境变量完成!" >> ${log_path}
 #fi
 
 # 刚刚都传
-if [[ "$time" > "13:00:0" ]] && [[ "$time" < "22:59:59" ]]; then
-  echo "开始启动 刚刚都传 爬虫脚本任务" >> ${log_path}
+if [[ "$time" > "10:00:0" ]] && [[ "$time" < "22:59:59" ]]; then
+  echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 刚刚都传 爬虫脚本任务" >> ${log_path}
   ps aux | grep run_zhongmiaoyinxin | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zhiqingtiantiankan | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep "run_ganggangdouchuan_recommend.py" | grep -v "grep"
   if [ "$?" -eq 1 ];then
-    echo "$(date "+%Y-%m-%d_%H:%M:%S") 异常停止,正在重启!" >> ${log_path}
-    if [ ${env} = "dev" ];then
-      cd ${piaoquan_crawler_dir} && sh main/scheduling_main.sh ./ganggangdouchuan/ganggangdouchuan_main/run_ganggangdouchuan_recommend.py --log_type="recommend" --crawler="ganggangdouchuan" --env="dev" ganggangdouchuan/logs/nohup-recommend.log
-    else
-      cd ${piaoquan_crawler_dir} && /bin/sh main/scheduling_main.sh ganggangdouchuan/ganggangdouchuan_main/run_ganggangdouchuan_recommend.py --log_type="recommend" --crawler="ganggangdouchuan" --env="offline" ganggangdouchuan/logs/nohup-recommend.log
-    fi
+    echo "$(date "+%Y-%m-%d_%H:%M:%S") 刚刚都传小程序爬虫, 异常停止, 正在重启!" >> ${log_path}
+    cd ${piaoquan_crawler_dir}
+    nohup python3 -u ganggangdouchuan/ganggangdouchuan_main/run_ganggangdouchuan_recommend.py --log_type="recommend" --crawler="ganggangdouchuan" --env=${env} >>ganggangdouchuan/logs/nohup-recommend.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") 重启完成!" >> ${log_path}
   else
-    echo "$(date "+%Y-%m-%d %H:%M:%S") 刚刚都传 进程状态正常" >> ${log_path}
+    echo "$(date "+%Y-%m-%d %H:%M:%S") 刚刚都传小程序爬虫, 进程状态正常" >> ${log_path}
   fi
 else
-  echo "刚刚都传 爬虫脚本任务结束" >> ${log_path}
+  echo "$(date "+%Y-%m-%d %H:%M:%S") 刚刚都传小程序爬虫, 任务结束" >> ${log_path}
 fi
 
 ## 众妙音信
@@ -84,7 +89,7 @@ fi
 
 
 # 删除日志
-echo "$(date "+%Y-%m-%d %H:%M:%S") 开始清理 5 天前的日志文件" >> ${log_path}
-find ${piaoquan_crawler_dir}main/main_logs/ -mtime +5 -name "*.log" -exec rm -rf {} \;
+echo "$(date "+%Y-%m-%d %H:%M:%S") 开始清理 10 天前的日志文件" >> ${log_path}
+find ${piaoquan_crawler_dir}main/main_logs/ -mtime +10 -name "*.log" -exec rm -rf {} \;
 echo "$(date "+%Y-%m-%d %H:%M:%S") 日志文件清理完毕" >> ${log_path}
 exit 0