xtn-tools-pro 1.0.0.6.5__tar.gz → 1.0.0.6.7__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {xtn-tools-pro-1.0.0.6.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.6.7}/PKG-INFO +1 -1
  2. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/setup.py +1 -1
  3. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/task_pro/go_fun_v3.py +3 -2
  4. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
  5. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/LICENSE +0 -0
  6. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/README.md +0 -0
  7. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/setup.cfg +0 -0
  8. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/__init__.py +0 -0
  9. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/db/MongoDB.py +0 -0
  10. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/db/MysqlDB.py +0 -0
  11. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/db/RedisDB.py +0 -0
  12. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/db/__init__.py +0 -0
  13. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
  14. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/proxy/__init__.py +0 -0
  15. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/proxy/proxy.py +0 -0
  16. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/task_pro/__init__.py +0 -0
  17. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/task_pro/go_fun.py +0 -0
  18. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/task_pro/go_fun_v2.py +0 -0
  19. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/tools.py +0 -0
  20. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/__init__.py +0 -0
  21. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/crypto.py +0 -0
  22. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/file_utils.py +0 -0
  23. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/helpers.py +0 -0
  24. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/log.py +0 -0
  25. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/retry.py +0 -0
  26. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/sql.py +0 -0
  27. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/utils/time_utils.py +0 -0
  28. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
  29. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
  30. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro.egg-info/requires.txt +0 -0
  31. {xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro.egg-info/top_level.txt +0 -0
{xtn-tools-pro-1.0.0.6.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.6.7}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.6.5
3
+ Version: 1.0.0.6.7
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com
{xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/setup.py RENAMED
@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
15
15
 
16
16
  setuptools.setup(
17
17
  name="xtn-tools-pro", # 模块名称
18
- version="1.0.0.6.5", # 版本
18
+ version="1.0.0.6.7", # 版本
19
19
  author="xtn", # 作者
20
20
  author_email="czw011122@gmail.com", # 作者邮箱
21
21
  description="xtn 开发工具", # 模块简介
{xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7}/xtn_tools_pro/task_pro/go_fun_v3.py RENAMED
@@ -101,11 +101,11 @@ class GoFunTaskV3:
101
101
  # go_task_fun_cnt = 0
102
102
  # go_task_fun_task_process = None
103
103
  self.manager_info["gofun_kill_status"] = False # 进程kill状态，True需要kill/False无需kill
104
- self.manager_info["gofun_kill_th_status"] = False # 线程kill状态，True需要kill/False无需kill
105
104
  self.manager_info["gofun_run_status_time"] = get_time_now_timestamp(is_time_10=True)
106
105
 
107
106
  go_process_list = []
108
107
  go_task_fun_cnt = 0
108
+
109
109
  while True:
110
110
  if not go_process_list and not self.manager_info["gofun_kill_status"]:
111
111
  # 未启动gofun 且 无需kill 则启动多进程多线程
@@ -135,7 +135,7 @@ class GoFunTaskV3:
135
135
  logger.info("检测到已达强制重启间隔，正在重启...")
136
136
  self.manager_info["gofun_kill_status"] = True
137
137
 
138
- logger.info("主线程正常...")
138
+ logger.info(f"主线程正常...{len(go_process_list)}...{self.manager_info['gofun_kill_status']}")
139
139
  time.sleep(10)
140
140
 
141
141
  def __get_external_ip(self):
@@ -170,6 +170,7 @@ class GoFunTaskV3:
170
170
  qsize = download_queue.qsize()
171
171
  logger.info(f"当前队列剩余任务数:{qsize}")
172
172
  if qsize >= 10:
173
+ self.manager_info["gofun_kill_status"] = False
173
174
  time.sleep(2)
174
175
  continue
175
176
  resp = requests.get(download_url, headers=headers, params=params, timeout=5)
{xtn-tools-pro-1.0.0.6.5 → xtn-tools-pro-1.0.0.6.7/xtn_tools_pro.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.0.6.5
3
+ Version: 1.0.0.6.7
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com