xtn-tools-pro 1.0.0.4.3__py3-none-any.whl → 1.0.0.4.4__py3-none-any.whl
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/task_pro/go_fun.py +5 -3
- {xtn_tools_pro-1.0.0.4.3.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/METADATA +1 -1
- {xtn_tools_pro-1.0.0.4.3.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/RECORD +6 -6
- {xtn_tools_pro-1.0.0.4.3.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/LICENSE +0 -0
- {xtn_tools_pro-1.0.0.4.3.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/WHEEL +0 -0
- {xtn_tools_pro-1.0.0.4.3.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/top_level.txt +0 -0
xtn_tools_pro/task_pro/go_fun.py
CHANGED
@@ -88,9 +88,11 @@ class GoFun:
|
|
88
88
|
args=(download_queue, upload_queue, proxies_dict,
|
89
89
|
self.__ini_info, go_task_function, logger))
|
90
90
|
go_task_fun_process.start()
|
91
|
+
go_task_fun_process.join()
|
91
92
|
|
92
93
|
download_task_process.join()
|
93
94
|
|
95
|
+
|
94
96
|
def __get_external_ip(self, logger):
|
95
97
|
"""
|
96
98
|
获取当前网络ip
|
@@ -103,7 +105,7 @@ class GoFun:
|
|
103
105
|
logger.warning(f"当前网络ip --> {rp_json}")
|
104
106
|
return rp_json['origin']
|
105
107
|
except Exception as e:
|
106
|
-
|
108
|
+
logger.critical(e)
|
107
109
|
|
108
110
|
def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info,logger):
|
109
111
|
"""
|
@@ -202,7 +204,7 @@ class GoFun:
|
|
202
204
|
}
|
203
205
|
result_list.append(task_item)
|
204
206
|
except Exception as e:
|
205
|
-
|
207
|
+
logger.critical(e)
|
206
208
|
|
207
209
|
# 回写任务
|
208
210
|
data = {"result": result_list, "remoteAddr": external_ip}
|
@@ -304,7 +306,7 @@ class GoFun:
|
|
304
306
|
processes_start_list = []
|
305
307
|
|
306
308
|
except Exception as e:
|
307
|
-
|
309
|
+
logger.critical(e)
|
308
310
|
|
309
311
|
def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, logger, go_task_function):
|
310
312
|
caller = inspect.stack()[1] # 获取调用者的调用栈信息
|
@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
|
|
10
10
|
xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
|
11
11
|
xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
|
12
12
|
xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
|
13
|
-
xtn_tools_pro/task_pro/go_fun.py,sha256=
|
13
|
+
xtn_tools_pro/task_pro/go_fun.py,sha256=oUhCTYSwbhHLMSm7u4NJAlX5CygeEnmri0NQgYXHNNM,14440
|
14
14
|
xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
|
15
15
|
xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
|
16
16
|
xtn_tools_pro/utils/file_utils.py,sha256=VfdIxog4s1UW5NpKkCvQsUs9qHjLoNCnstZbnftkT4w,2046
|
@@ -19,8 +19,8 @@ xtn_tools_pro/utils/log.py,sha256=3zbKpWNEdU9bOzi7E-CUt4M0cTewCAfxjp8WjxCN9-M,10
|
|
19
19
|
xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
|
20
20
|
xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
|
21
21
|
xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
|
22
|
-
xtn_tools_pro-1.0.0.4.
|
23
|
-
xtn_tools_pro-1.0.0.4.
|
24
|
-
xtn_tools_pro-1.0.0.4.
|
25
|
-
xtn_tools_pro-1.0.0.4.
|
26
|
-
xtn_tools_pro-1.0.0.4.
|
22
|
+
xtn_tools_pro-1.0.0.4.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
23
|
+
xtn_tools_pro-1.0.0.4.4.dist-info/METADATA,sha256=DqaUxyIfwPXuyCCopcYCLDt5V8qRIVjK8WrFbx6l-IQ,455
|
24
|
+
xtn_tools_pro-1.0.0.4.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
25
|
+
xtn_tools_pro-1.0.0.4.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
|
26
|
+
xtn_tools_pro-1.0.0.4.4.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|