xtn-tools-pro 1.0.1.1.4__tar.gz → 1.0.1.1.6__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 (67) hide show
  1. {xtn-tools-pro-1.0.1.1.4/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.1.6}/PKG-INFO +1 -1
  2. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/setup.py +1 -1
  3. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/task_pro/go_fun_v3.py +5 -10
  4. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6/xtn_tools_pro.egg-info}/PKG-INFO +1 -1
  5. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/LICENSE +0 -0
  6. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/MANIFEST.in +0 -0
  7. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/README.md +0 -0
  8. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/setup.cfg +0 -0
  9. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/__init__.py +0 -0
  10. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/db/MongoDB.py +0 -0
  11. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/db/MysqlDB.py +0 -0
  12. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/db/RedisDB.py +0 -0
  13. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/db/__init__.py +0 -0
  14. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/__init__.py +0 -0
  15. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/cli.py +0 -0
  16. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/.gitignore +0 -0
  17. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/Dockerfile +0 -0
  18. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/README.md +0 -0
  19. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/__init__.py +0 -0
  20. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/__init__.py +0 -0
  21. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/api/__init__.py +0 -0
  22. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/api/v1/__init__.py +0 -0
  23. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/api/v1/demo.py +0 -0
  24. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/app.py +0 -0
  25. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/config/__init__.py +0 -0
  26. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/config/secure.py +0 -0
  27. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/config/setting.py +0 -0
  28. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/__init__.py +0 -0
  29. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/base.py +0 -0
  30. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/error.py +0 -0
  31. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/error_code.py +0 -0
  32. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/redprint.py +0 -0
  33. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/libs/token_auth.py +0 -0
  34. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/models/__init__.py +0 -0
  35. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/models/base.py +0 -0
  36. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/models/redis_demo.py +0 -0
  37. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/validators/__init__.py +0 -0
  38. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/validators/base.py +0 -0
  39. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/app/validators/demo.py +0 -0
  40. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/docker-compose.yml +0 -0
  41. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/logs/__init__.py +0 -0
  42. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/obj/__init__.py +0 -0
  43. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/requirements.txt +0 -0
  44. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/server_run.py +0 -0
  45. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/test/__init__.py +0 -0
  46. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/flask_demo/templates/uwsgi.ini +0 -0
  47. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/proxy/XiaoXiangProxy.py +0 -0
  48. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/proxy/__init__.py +0 -0
  49. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/proxy/proxy.py +0 -0
  50. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/task_pro/__init__.py +0 -0
  51. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/task_pro/go_fun_air_v1.py +0 -0
  52. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/tools.py +0 -0
  53. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/__init__.py +0 -0
  54. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/crypto.py +0 -0
  55. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/file_utils.py +0 -0
  56. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/helpers.py +0 -0
  57. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/log.py +0 -0
  58. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/retry.py +0 -0
  59. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/set_data.py +0 -0
  60. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/shell.py +0 -0
  61. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/sql.py +0 -0
  62. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/utils/time_utils.py +0 -0
  63. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro.egg-info/SOURCES.txt +0 -0
  64. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro.egg-info/dependency_links.txt +0 -0
  65. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro.egg-info/entry_points.txt +0 -0
  66. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro.egg-info/requires.txt +0 -0
  67. {xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro.egg-info/top_level.txt +0 -0
{xtn-tools-pro-1.0.1.1.4/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.1.6}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xtn-tools-pro
3
- Version: 1.0.1.1.4
3
+ Version: 1.0.1.1.6
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com
{xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/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.1.1.4", # 版本
18
+ version="1.0.1.1.6", # 版本
19
19
  author="xtn", # 作者
20
20
  author_email="czw011122@gmail.com", # 作者邮箱
21
21
  description="xtn 开发工具", # 模块简介
{xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6}/xtn_tools_pro/task_pro/go_fun_v3.py RENAMED
@@ -139,7 +139,8 @@ class GoFunTaskV3:
139
139
  go_task_fun_cnt += 1
140
140
  logger.info(f"第{go_task_fun_cnt}次,进程数:{processes_num},线程数:{thread_num},等待{restart_time}秒强制下一次")
141
141
 
142
- elif self.manager_info["gofun_kill_status"] and go_process_list:
142
+ elif self.manager_info["gofun_kill_status"] and go_process_list or self.manager_info[
143
+ "gofun_kill_status_qz"]:
143
144
  # 需kill
144
145
  logger.info("检测到关闭指令，正在关闭gofun进程...")
145
146
  for p in go_process_list:
@@ -147,6 +148,7 @@ class GoFunTaskV3:
147
148
  p.join()
148
149
  go_process_list = []
149
150
  go_task_status_error = 0
151
+ self.manager_info["gofun_kill_status_qz"] = False
150
152
  logger.info("检测到关闭指令，关闭gofun成功!!!")
151
153
 
152
154
  elif not self.manager_info["gofun_kill_status"] and go_process_list:
@@ -155,15 +157,6 @@ class GoFunTaskV3:
155
157
  logger.info("检测到已达强制重启间隔，正在重启...")
156
158
  self.manager_info["gofun_kill_status"] = True
157
159
 
158
- if self.manager_info["gofun_kill_status_qz"]:
159
- for p in go_process_list:
160
- # p.terminate()
161
- p.join()
162
- go_process_list = []
163
- go_task_status_error = 0
164
- logger.info("检测到强制关闭指令，关闭gofun成功!!!")
165
- self.manager_info["gofun_kill_status_qz"] = False
166
-
167
160
  logger.info(
168
161
  f"主线程正常...进程数:{len(go_process_list)}...gofun(True不存在|False正常):{self.manager_info['gofun_kill_status']}...qz:{self.manager_info['gofun_kill_status_qz']}")
169
162
  time.sleep(10)
@@ -209,6 +202,8 @@ class GoFunTaskV3:
209
202
  now_qsize_v_time = get_time_now_timestamp(is_time_10=True)
210
203
 
211
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
212
207
  manager_info["gofun_kill_status_qz"] = True
213
208
 
214
209
  time.sleep(download_not_task_time)
{xtn-tools-pro-1.0.1.1.4 → xtn-tools-pro-1.0.1.1.6/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.1.1.4
3
+ Version: 1.0.1.1.6
4
4
  Summary: xtn 开发工具
5
5
  Author: xtn
6
6
  Author-email: czw011122@gmail.com