wangkun 1 年之前
父节点
当前提交
cda8fe3d9c
共有 3 个文件被更改,包括 5 次插入18 次删除
  1. 2 2
      README.MD
  2. 3 3
      common/common.py
  3. 0 13
      shipinhao/shipinhao_main/run_test.py

+ 2 - 2
README.MD

@@ -281,7 +281,7 @@ ps aux | grep shipinhao_search | grep -v grep | awk '{print $2}' | xargs kill -9
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "xg" "xigua" "recommend" "prod"
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "xg" "xigua" "author" "prod"
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "xg" "xigua" "search" "prod"
-* * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "bszf" "benshanzhfu" "recommend" "prod"
+* * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "bszf" "benshanzhufu" "recommend" "prod"
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "ks" "kuaishou" "recommend" "prod"
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "ks" "kuaishou" "author" "prod"
 * * * * * /usr/bin/sh /root/piaoquan_crawler/main/process_mq.sh "dy" "douyin" "recommend" "prod"
@@ -294,9 +294,9 @@ ps aux | grep shipinhao_search | grep -v grep | awk '{print $2}' | xargs kill -9
 
 杀进程
 ps aux | grep suisuiniannianyingfuqi | grep -v grep | awk '{print $2}' | xargs kill -9
+ps aux | grep benshanzhufu | grep -v grep | awk '{print $2}' | xargs kill -9
 ps aux | grep gongzhonghao | grep -v grep | awk '{print $2}' | xargs kill -9
 ps aux | grep xigua | grep -v grep | awk '{print $2}' | xargs kill -9
-ps aux | grep benshanzhufu | grep -v grep | awk '{print $2}' | xargs kill -9
 ps aux | grep kuaishou | grep -v grep | awk '{print $2}' | xargs kill -9
 ps aux | grep douyin | grep -v grep | awk '{print $2}' | xargs kill -9
 ps aux | grep xiaoniangao | grep -v grep | awk '{print $2}' | xargs kill -9

+ 3 - 3
common/common.py

@@ -40,7 +40,8 @@ class Common:
             os.makedirs(log_path)
 
         # 日志文件名
-        log_name = time.strftime("%Y-%m-%d", time.localtime(time.time())) + f'-{crawler}-{log_type}.log'
+        # log_name = time.strftime("%Y-%m-%d", time.localtime(time.time())) + f'-{crawler}-{log_type}.log'
+        log_name = f'{date.today()}-{crawler}-{log_type}.log'
 
         # 日志不打印到控制台
         logger.remove(handler_id=None)
@@ -50,7 +51,7 @@ class Common:
         # rotation="1 week",每周创建一个文件
         # retention="10 days",每隔10天之后就会清理旧的日志
         # 初始化日志
-        logger.add(log_dir + log_name, level="INFO", rotation='00:00')
+        logger.add(f"{log_dir}{log_name}", level="INFO", rotation='00:00')
 
         return logger
 
@@ -340,6 +341,5 @@ class Common:
 
 if __name__ == "__main__":
     Common.tunnel_proxies()
-
     pass
 

+ 0 - 13
shipinhao/shipinhao_main/run_test.py

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Author: wangkun
-# @Time: 2023/6/7
-from common.common import Common
-
-
-def test(log_type, crawler):
-    print("just test")
-    Common.logger(log_type, crawler).info("just test")
-
-
-if __name__ == "__main__":
-    test("test1", "test2")