wangkun 2 年之前
父節點
當前提交
6f3883e4eb
共有 3 個文件被更改,包括 14 次插入22 次删除
  1. 3 3
      haokan.sh
  2. 5 9
      main/run_haokan_channel.py
  3. 6 10
      main/run_haokan_hot.py

+ 3 - 3
haokan.sh

@@ -11,9 +11,9 @@ echo "$(date "+%Y-%m-%d %H:%M:%S") 进程已杀死!"
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
 cd /data5/wangkun/crawler_haokan/ && git pull origin master --force
 echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成!"
-
+source /etc/profile
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启服务..."
-nohup python -u main/run_haokan_hot.py >>./nohup.log 2>&1 &
-nohup python -u main/run_haokan_channel.py >>./nohup.log 2>&1 &
+nohup python3 -u main/run_haokan_hot.py >>./nohup.log 2>&1 &
+nohup python3 -u main/run_haokan_channel.py >>./nohup.log 2>&1 &
 echo "$(date "+%Y-%m-%d %H:%M:%S") 服务重启完毕!"
 exit 0

+ 5 - 9
main/run_haokan_channel.py

@@ -12,15 +12,11 @@ from main.haokan_channel import Channel
 class Main:
     @classmethod
     def main(cls, log_type, env):
-        try:
-            while True:
-                Channel.get_all_channel_videos(log_type, env)
-                Common.del_logs(log_type)
-                Common.logger(log_type).info('休眠 1 小时\n')
-                time.sleep(3600)
-        except Exception as e:
-            Common.logger(log_type).error(f'{e}\n重新运行抓取程序\n')
-            cls.main(log_type, env)
+        while True:
+            Channel.get_all_channel_videos(log_type, env)
+            Common.del_logs(log_type)
+            Common.logger(log_type).info('休眠 1 小时\n')
+            time.sleep(3600)
 
 
 if __name__ == '__main__':

+ 6 - 10
main/run_haokan_hot.py

@@ -13,16 +13,12 @@ from main.haokan_hot import Hot
 class Main:
     @classmethod
     def main(cls, log_type, our_id, env):
-        try:
-            while True:
-                Hot.get_hot_feeds(log_type, our_id, env)
-                Common.del_logs(log_type)
-                Hot.page = 0
-                Common.logger(log_type).info('热榜抓取完毕,休眠1小时\n')
-                time.sleep(3600)
-        except Exception as e:
-            Common.logger(log_type).error(f'{e}\n重新运行抓取程序\n')
-            cls.main(log_type, our_id, env)
+        while True:
+            Hot.get_hot_feeds(log_type, our_id, env)
+            Common.del_logs(log_type)
+            Hot.page = 0
+            Common.logger(log_type).info('热榜抓取完毕,休眠1小时\n')
+            time.sleep(3600)
 
 
 if __name__ == '__main__':