xtn-tools-pro 1.0.0.5.1__tar.gz → 1.0.0.5.2__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.
- {xtn-tools-pro-1.0.0.5.1/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.5.2}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/setup.py +1 -1
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/task_pro/go_fun.py +19 -3
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/LICENSE +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/README.md +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/setup.cfg +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/db/MongoDB.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/db/MysqlDB.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/db/RedisDB.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/db/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/proxy/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/proxy/proxy.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/task_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/tools.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/__init__.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/crypto.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/file_utils.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/helpers.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/log.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/retry.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/sql.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro/utils/time_utils.py +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro.egg-info/requires.txt +0 -0
- {xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro.egg-info/top_level.txt +0 -0
|
@@ -85,6 +85,7 @@ class GoFun:
|
|
|
85
85
|
"name": "_download_and_upload_task",
|
|
86
86
|
"args": (download_queue, upload_queue, proxies_dict, self.__ini_info, logger),
|
|
87
87
|
"start_time": 0,
|
|
88
|
+
"restart_time": int(restart_time),
|
|
88
89
|
},
|
|
89
90
|
"_go_task_fun_task": {
|
|
90
91
|
"target": self._go_task_fun_task,
|
|
@@ -107,7 +108,7 @@ class GoFun:
|
|
|
107
108
|
for p_item_info in processes_item_info.values():
|
|
108
109
|
task_process = p_item_info["task_process"]
|
|
109
110
|
task_process_start_time = p_item_info["start_time"]
|
|
110
|
-
task_process_restart_time = p_item_info.get("restart_time",0)
|
|
111
|
+
task_process_restart_time = p_item_info.get("restart_time", 0)
|
|
111
112
|
# 检查子进程是否存活
|
|
112
113
|
task_process_pid = task_process.pid
|
|
113
114
|
task_process_name = task_process.name
|
|
@@ -125,8 +126,9 @@ class GoFun:
|
|
|
125
126
|
else:
|
|
126
127
|
if not task_process_restart_time:
|
|
127
128
|
continue
|
|
128
|
-
if task_process_start_time+task_process_restart_time <= get_time_now_timestamp(is_time_10=True):
|
|
129
|
-
logger.critical(
|
|
129
|
+
if task_process_start_time + task_process_restart_time <= get_time_now_timestamp(is_time_10=True):
|
|
130
|
+
logger.critical(
|
|
131
|
+
f"进程已超过设置时间，正在强制关闭进程,{task_process_restart_time},{task_process_is_alive},{task_process_name},{task_process_pid}")
|
|
130
132
|
task_process.terminate()
|
|
131
133
|
task_process.join() # 等待进程确实结束
|
|
132
134
|
p_item = processes_item_info[task_process_name]
|
|
@@ -386,3 +388,17 @@ class GoFun:
|
|
|
386
388
|
"upload_task_tine": "回写间隔",
|
|
387
389
|
}
|
|
388
390
|
return ini_dict
|
|
391
|
+
|
|
392
|
+
def get_download_task(self, download_queue, block, timeout):
|
|
393
|
+
"""
|
|
394
|
+
获取下载任务
|
|
395
|
+
:param download_queue:下载队列
|
|
396
|
+
:param block: 是否阻塞等待 True阻塞/False不阻塞
|
|
397
|
+
:param timeout:
|
|
398
|
+
:return:
|
|
399
|
+
"""
|
|
400
|
+
try:
|
|
401
|
+
task_item = download_queue.get(block=block, timeout=timeout)
|
|
402
|
+
return task_item
|
|
403
|
+
except Exception as e:
|
|
404
|
+
self.logger.critical(f"get_download_task 获取下载任务 报错 {e}")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xtn-tools-pro-1.0.0.5.1 → xtn-tools-pro-1.0.0.5.2}/xtn_tools_pro.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|