update 欢欢喜喜祝福到启动命令，增加欢欢喜喜祝福到common日志

common/common.py

@@ -92,7 +92,8 @@ class Common:
             or crawler == "jixiangxingfu"\
             or crawler == "zhufuquanzi" \
             or crawler == "xiaoniangaoplus" \
-            or crawler == "zhongmiaoyinxin":
+            or crawler == "zhongmiaoyinxin" \
+            or crawler == "huanhuanxixizhufudao":
             project = 'crawler-log-prod'
             logstore = 'crawler-log-prod'
             endpoint = 'cn-hangzhou.log.aliyuncs.com'

huanhuanxixizhufudao/huanhuanxixizhufudao_recommend/huanhuanxixizhufudao_recommend.py

@@ -32,9 +32,9 @@ class HhxxzfdRecommend:
     @classmethod
     def start_wechat(cls, log_type, crawler, env, rule_dict, our_uid):
         if env == "dev":
-            chromedriverExecutable = "/Users/tzld/Downloads/chromedriver_v111/chromedriver"
+            chromedriverExecutable = "/Users/piaoquan/Downloads/chromedriver"
         else:
-            chromedriverExecutable = "/Users/crawler/Downloads/chromedriver_v111/chromedriver"
+            chromedriverExecutable = "/Users/piaoquan/Downloads/chromedriver"
 
         Common.logger(log_type, crawler).info("启动微信")
         Common.logging(log_type, crawler, env, '启动微信')
@@ -64,7 +64,7 @@ class HhxxzfdRecommend:
 
         for i in range(120):
             try:
-                if driver.find_elements(By.ID, "com.tencent.mm:id/f2s"):
+                if driver.find_elements(By.ID, 'com.tencent.mm:id/f2s'):
                     Common.logger(log_type, crawler).info("微信启动成功")
                     Common.logging(log_type, crawler, env, '微信启动成功')
                     break

main/process_mq.sh

@@ -6,12 +6,12 @@ log_type=$3 # 爬虫策略
 env=$4      # 环境
 
 if [ ${env} = "dev" ];then
-  piaoquan_crawler_dir=/Users/crawler/Desktop/piaoquan_crawler/
+  piaoquan_crawler_dir=/Users/tzld/Desktop/piaoquan_crawler/
   profile_path=/etc/profile
   python=python3
   log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
 elif [ ${crawler} = "zfqz" ];then
-  piaoquan_crawler_dir=/Users/crawler/Desktop/piaoquan_crawler/
+  piaoquan_crawler_dir=/Users/piaoquan/Desktop/piaoquan_crawler/
   profile_path=./base_profile
   python=python3
   log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
@@ -20,16 +20,22 @@ elif [ ${env} = "hk" ];then
   profile_path=/etc/profile
   python=python3
   log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
-elif [ ${crawler} = "kykjk" ];then
-  piaoquan_crawler_dir=/Users/kanyikan/Desktop/crawler/piaoquan_crawler/
+elif [ ${crawler} = "kykhcm" ];then
+  piaoquan_crawler_dir=/Users/piaoquan/Desktop/piaoquan_crawler/
   profile_path=/.base_profile
   python=python3
   log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
-elif [ ${crawler} = "kykzzcl" ];then
-  piaoquan_crawler_dir=/Users/crawler/Desktop/piaoquan_crawler/
+elif [ ${crawler} = "hhxxzfd" ];then
+  piaoquan_crawler_dir=/Users/piaoquan/Desktop/piaoquan_crawler/
   profile_path=/.base_profile
   python=python3
   log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
+elif [ ${crawler} = "kykjk" ];then
+  piaoquan_crawler_dir=/Users/kanyikan/Desktop/crawler/piaoquan_crawler/
+  profile_path=/.base_profile
+  python=python3
+  log_path=${piaoquan_crawler_dir}main/main_logs/process-mq-$(date +%Y-%m-%d).log
+
 elif [ ${crawler} = "sph" ] && [ ${log_type} = "search" ];then
   piaoquan_crawler_dir=/Users/piaoquan/Desktop/piaoquan_crawler/
   profile_path=/etc/profile

main/process_offline.sh

@@ -35,10 +35,11 @@ if [[ "$time" > "00:00:00"  &&  "$time" < "00:59:59" || "$time" > "12:00:00"  &&
   ps aux | grep run_zhongmiaoyinxin | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_hhxxzfd | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep "run_htzf_recommend.py" | grep -v "grep"
   if [ "$?" -eq 1 ];then
     echo "$(date "+%Y-%m-%d %H:%M:%S") 海豚祝福小程序爬虫, 异常停止, 正在重启!" >> ${log_path}
-    adb forward --remmove-all
+    adb forward --remove-all
     cd ${piaoquan_crawler_dir}
     nohup python3 -u haitunzhufu/haitunzhufu_main/run_htzf_recommend.py --log_type="recommend" --crawler="haitunzhufu" --env=${env} >> haitunzhufu/logs/nohup-recommend.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") 重启完成!" >> ${log_path}
@@ -55,10 +56,11 @@ if [[ "$time" > "01:00:00"  &&  "$time" < "01:59:59" || "$time" > "13:00:00"  &&
   ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zhongmiaoyinxin | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_hhxxzfd | 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}
-    adb forward --remmove-all
+    adb forward --remove-all
     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}
@@ -70,15 +72,16 @@ else
 fi
 
 # 吉祥幸福
-if [[ "$time" > "02:00:00"  &&  "$time" < "02:59:59" || "$time" > "14:00:00"  &&  "$time" < "14:59:59" || "$time" > "19:00:00"  &&  "$time" < "20:59:59" ]];then
+if [[ "$time" > "02:00:00"  &&  "$time" < "02:59:59" || "$time" > "14:00:00"  &&  "$time" < "14:59:59" ]];then
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 吉祥幸福 爬虫脚本任务" >> ${log_path}
   ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_zhongmiaoyinxin | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_hhxxzfd | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep "run_jixiangxingfu_recommend.py" | grep -v "grep"
   if [ "$?" -eq 1 ];then
     echo "$(date "+%Y-%m-%d %H:%M:%S") 吉祥幸福爬虫, 异常停止, 正在重启!" >> ${log_path}
-    adb forward --remmove-all
+    adb forward --remove-all
     cd ${piaoquan_crawler_dir}
     nohup python3 -u jixiangxingfu/jixiangxingfu_main/run_jixiangxingfu_recommend.py --log_type="recommend" --crawler="jixiangxingfu" --env=${env} >>jixiangxingfu/logs/nohup-recommend.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") 重启完成!" >> ${log_path}
@@ -89,16 +92,18 @@ else
   echo "$(date "+%Y-%m-%d %H:%M:%S") 吉祥幸福 爬虫脚本任务结束" >> ${log_path}
 fi
 
+
 # 众妙音信
 if [[ "$time" > "03:00:00"  &&  "$time" < "03:59:59" || "$time" > "15:00:00"  &&  "$time" < "15:59:59" ]];then
   echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 众妙音信 爬虫脚本任务" >> ${log_path}
   ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
   ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_hhxxzfd | grep -v grep | awk '{print $2}' | xargs kill -9
   ps -ef | grep "run_zhongmiaoyinxin_recommend.py" | grep -v "grep"
   if [ "$?" -eq 1 ];then
     echo "$(date "+%Y-%m-%d %H:%M:%S") 众妙音信小程序爬虫, 异常停止, 正在重启!" >> ${log_path}
-    adb forward --remmove-all
+    adb forward --remove-all
     cd ${piaoquan_crawler_dir}
     nohup python3 -u zhongmiaoyinxin/zhongmiaoyinxin_main/run_zhongmiaoyinxin_recommend.py --log_type="recommend" --crawler="zhongmiaoyinxin" --env=${env} >>zhongmiaoyinxin/logs/nohup-recommend.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") 重启完成!" >> ${log_path}
@@ -111,6 +116,29 @@ else
 fi
 
 
+# 欢欢喜喜祝福到
+if [[ "$time" > "04:00:00"  &&  "$time" < "04:59:59" || "$time" > "17:00:00"  &&  "$time" < "17:59:59" || "$time" > "10:00:00"  &&  "$time" < "11:59:59" ]];then
+  echo "$(date "+%Y-%m-%d %H:%M:%S") 开始启动 欢欢喜喜祝福到 爬虫脚本任务" >> ${log_path}
+  ps aux | grep run_htzf | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_ganggangdouchuan | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_jixiangxingfu | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps aux | grep run_hhxxzfd | grep -v grep | awk '{print $2}' | xargs kill -9
+  ps -ef | grep "run_hhxxzfd_recommend.py" | grep -v "grep"
+  if [ "$?" -eq 1 ];then
+    echo "$(date "+%Y-%m-%d %H:%M:%S") 欢欢喜喜祝福到小程序爬虫, 异常停止, 正在重启!" >> ${log_path}
+    adb forward --remove-all
+    cd ${piaoquan_crawler_dir}
+    /bin/sh ${piaoquan_crawler_dir}main/process_mq.sh "hhxxzfd" "huanhuanxixizhufudao" "recommend" ${env}
+#    nohup python3 -u huanhuanxixizhufudao/huanhuanxixizhufudao_main/run_hhxxzfd_recommend.py --log_type="recommend" --crawler="huanhuanxixizhufudao" --env=${env} >>huanhuanxixizhufudao/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}
+  fi
+else
+  echo "$(date "+%Y-%m-%d %H:%M:%S") 欢欢喜喜祝福到 爬虫脚本任务结束" >> ${log_path}
+fi
+
+
 # 删除日志
 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 {} \;