xtn-tools-pro 1.0.1.1.5__tar.gz → 1.0.1.1.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.
- {xtn-tools-pro-1.0.1.1.5/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.1.7}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/setup.py +1 -1
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/task_pro/go_fun_v3.py +2 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/shell.py +8 -3
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/LICENSE +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/MANIFEST.in +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/README.md +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/setup.cfg +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/db/MongoDB.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/db/MysqlDB.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/db/RedisDB.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/db/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/cli.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/.gitignore +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/Dockerfile +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/README.md +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/api/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/api/v1/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/api/v1/demo.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/app.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/config/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/config/secure.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/config/setting.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/base.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/error.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/error_code.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/redprint.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/libs/token_auth.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/models/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/models/base.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/models/redis_demo.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/validators/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/validators/base.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/validators/demo.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/docker-compose.yml +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/logs/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/obj/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/requirements.txt +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/server_run.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/test/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/uwsgi.ini +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/proxy/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/proxy/proxy.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/task_pro/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/task_pro/go_fun_air_v1.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/tools.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/__init__.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/crypto.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/file_utils.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/helpers.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/log.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/retry.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/set_data.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/sql.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/utils/time_utils.py +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/entry_points.txt +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/requires.txt +0 -0
- {xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/top_level.txt +0 -0
|
@@ -202,6 +202,8 @@ class GoFunTaskV3:
|
|
|
202
202
|
now_qsize_v_time = get_time_now_timestamp(is_time_10=True)
|
|
203
203
|
|
|
204
204
|
if now_qsize_v_time + (60 * 5) < get_time_now_timestamp(is_time_10=True):
|
|
205
|
+
now_qsize_v = None
|
|
206
|
+
now_qsize_v_time = None
|
|
205
207
|
manager_info["gofun_kill_status_qz"] = True
|
|
206
208
|
|
|
207
209
|
time.sleep(download_not_task_time)
|
|
@@ -36,7 +36,7 @@ class ShellPro:
|
|
|
36
36
|
self.server_info_list[_]["conn"] = conn
|
|
37
37
|
self.__logger.info(f"{tips} 连接成功!!!")
|
|
38
38
|
|
|
39
|
-
def run_shell(self, conn, cmd, warn=False, hide=True, tips=""):
|
|
39
|
+
def run_shell(self, conn, cmd, warn=False, hide=True, tips="", retry_cnt=5):
|
|
40
40
|
"""
|
|
41
41
|
传入conn和命令执行
|
|
42
42
|
:param conn:
|
|
@@ -46,8 +46,13 @@ class ShellPro:
|
|
|
46
46
|
:param tips: 备注信息
|
|
47
47
|
:return:
|
|
48
48
|
"""
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
for _ in range(retry_cnt):
|
|
50
|
+
try:
|
|
51
|
+
conn.run(cmd, warn=warn, hide=hide)
|
|
52
|
+
self.__logger.info(f"{tips} {cmd}")
|
|
53
|
+
return
|
|
54
|
+
except Exception as e:
|
|
55
|
+
self.__logger.critical(f"{tips} {cmd} {e} 正在重试")
|
|
51
56
|
|
|
52
57
|
def update_file(self, local_file, remote_file, mkdir=False):
|
|
53
58
|
"""
|
|
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.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/.gitignore
RENAMED
|
File without changes
|
{xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/Dockerfile
RENAMED
|
File without changes
|
{xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/README.md
RENAMED
|
File without changes
|
{xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/app/app.py
RENAMED
|
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.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/server_run.py
RENAMED
|
File without changes
|
|
File without changes
|
{xtn-tools-pro-1.0.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro/flask_demo/templates/uwsgi.ini
RENAMED
|
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.1.1.5 → xtn-tools-pro-1.0.1.1.7}/xtn_tools_pro.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|