toolkits 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

toolkits/{libs_core → config_parser}/config_helper.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from .load_module import LoadModule
+from toolkits.libs_core.load_module import LoadModule
 
 
 class ConfigHelpers:

toolkits/{libs_core → config_parser}/env_prepare.py

@@ -12,7 +12,7 @@ from toolkits.system.shell_helper import exec_shell
 from unipath import Path
 
 from .config_helper import ConfigHelpers
-from .mysql_helper import MysqlHelper
+from toolkits.databases.mysql_helper import MysqlHelper
 
 logger = log("EnvPrepare")
 

toolkits/db_query_demo.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
-import json
 import traceback
 
 import fire
 from log4python.Log4python import log
 from toolkits.system.basic_utils import get_script_directory
 
-from toolkits.libs_core.env_prepare import EnvPrepare
-from toolkits.libs_core.mysql_helper import MysqlHelper
+from toolkits.config_parser.env_prepare import EnvPrepare
+from toolkits.databases.mysql_helper import MysqlHelper
 
 logger = log("DbQueryDemo")
 

toolkits/system/shell_helper.py

@@ -121,20 +121,22 @@ return-val
     return result
 
 
-async def run_command_async(command, timeout=5):
+async def run_command_async(command, timeout=5, encoding="utf-8", shell=False, cwd=None, env=None):
     process = None
     try:
         process = await asyncio.create_subprocess_shell(
             command,
-
             stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE
+            stderr=asyncio.subprocess.PIPE,
+            shell=shell,
+            cwd=cwd,
+            env=env
         )
         stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=timeout)
         ret = {
             "exit_code": process.returncode,
-            "stdout": stdout,
-            "stderr": stderr
+            "stdout": str(stdout.decode(encoding)).splitlines(False),
+            "stderr": str(stderr.decode(encoding)).splitlines(False)
         }
         return ret
     except asyncio.TimeoutError:
@@ -148,15 +150,31 @@ async def run_command_async(command, timeout=5):
         return ret
 
 
-def exec_shell_async(command, timeout=5):
+def exec_shell_async(command, timeout=60 * 10, encoding="utf-8", cwd=None, env=None):
+    """
+    异常执行命令，检测执行时间超时
+    :param command:  要执行的命令
+    :param timeout:  等待的超时时间，超时后，返回: exit_code=-1
+    :param encoding: 解析命令行返回数据的编码格式，默认为：utf-8, 中文Windows环境可指定为：GBK
+    :param env:
+    :param cwd:
+    :param shell:
+    :return: {'exit_code': 0, 'stdout': '\r\n正在 Ping 127.0.0.1 具有 32 字节的数据:\r\n来自 127.0.0.1 的回复: 字节=32 时间<1ms TTL=128\r\n\r\n', 'stderr': ''}
+    """
+    if command == "" or command is None:
+        ret = {
+            "exit_code": -1,
+            "stdout": "",
+            "stderr": "No cmd was found"
+        }
+        return ret
+
     loop = asyncio.get_event_loop()
-    return loop.run_until_complete(run_command_async(command, timeout=timeout))
+    return loop.run_until_complete(run_command_async(command, timeout=timeout, encoding=encoding, cwd=cwd, env=env))
 
 
-def exec_shell(cmd, timeout=0, bufsize=0, executable=None,
-               stdin=None, stdout=None, stderr=None,
-               preexec_fn=None, close_fds=False, shell=False,
-               cwd=None, env=None, universal_newlines=False,
+def exec_shell(cmd, timeout=0, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None,
+               preexec_fn=None, close_fds=False, shell=False, cwd=None, env=None, universal_newlines=False,
                startupinfo=None, creationflags=0):
     """exec_shell("grep 'processor' /proc/cpuinfo | sort -u | wc -l")
 
@@ -170,17 +188,22 @@ return-code::
     }
 code-end
 
+    :param cmd:  exec command
     :param preexec_fn:
     :type stdin: object
     :param executable:
     :param cwd:
     :param timeout:
-    :param cmd:  exec command
     :return: return a dict to caller
 
     """
     if cmd == "" or cmd is None:
-        return "No Cmd Input"
+        ret = {
+            "exit_code": -1,
+            "stdout": "",
+            "stderr": "No cmd was found"
+        }
+        return ret
 
     fp_out = subprocess.PIPE
     fp_err = subprocess.PIPE

toolkits/tookits_cli.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
-import sys
 import traceback
 
 import fire
 from log4python.Log4python import log
 from toolkits.system.basic_utils import get_script_directory
 
-from libs_core.env_prepare import EnvPrepare
+from toolkits.config_parser.env_prepare import EnvPrepare
 from tookits_app import tookitsApp
 from libs_core.process_admin import ProcessAdmin
 from db_query_demo import DbQueryDemo

{toolkits-0.2.7.dist-info → toolkits-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolkits
-Version: 0.2.7
+Version: 0.2.8
 Summary: toolkits for quickly reference
 Author-Email: li_jia_yue <59727816@qq.com>
 License: MIT

{toolkits-0.2.7.dist-info → toolkits-0.2.8.dist-info}/RECORD

@@ -1,30 +1,30 @@
-toolkits-0.2.7.dist-info/METADATA,sha256=UAc6iTuOM6I0yDPPPMP6Y7AwYSLtKhRoytG4jyl3ytw,1157
-toolkits-0.2.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-toolkits-0.2.7.dist-info/entry_points.txt,sha256=ioUpExuekI3N4XaBZ8NKV1mx0DZnKWLkg2PoGICq6OY,72
+toolkits-0.2.8.dist-info/METADATA,sha256=121FvPMYfCOhTy7dYjZwzJBMQ461qD70MCQqpF6PkYs,1157
+toolkits-0.2.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+toolkits-0.2.8.dist-info/entry_points.txt,sha256=ioUpExuekI3N4XaBZ8NKV1mx0DZnKWLkg2PoGICq6OY,72
 toolkits/3des/3des.py,sha256=DWfAUGtU7U74GrpnIgA8ZEw7R-kKWyKGfv3Ycqachlw,3400
 toolkits/3des/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/__init__.py,sha256=CBKKalWuRi-mXuf2iwrAI5zzzGcUU5e8xhQNgqBERmg,50
 toolkits/basic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/basic/list_helper.py,sha256=jvD-YFneCC-LSCgsJ4PWKhBd-hxuE8PAFXScmtbg3kc,717
-toolkits/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolkits/config/config_demo.py,sha256=F9gfD5o7psX6gBXcYc4PVcavTAGECJ5U8Qv98xysJ3k,1087
+toolkits/config_parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+toolkits/config_parser/config_demo.py,sha256=F9gfD5o7psX6gBXcYc4PVcavTAGECJ5U8Qv98xysJ3k,1087
+toolkits/config_parser/config_groups_helper.py,sha256=k3ji_4iZVqTL5jB6xrIUKNbATM7Aoc0gAi7rJ1HyJeA,1987
+toolkits/config_parser/config_helper.py,sha256=I07Zs5a9ndShtGPHMktA6OE1JOhpAG3bZdjZ9LBiYNk,512
+toolkits/config_parser/env_prepare.py,sha256=SrVfLTT1hf8vOcBiSZm6352mzXuzYGRqgTSIbKPkb4Q,6121
 toolkits/databases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/databases/database_client_util.py,sha256=Jy1d7xbKmbkxfUWNiz1K-BY1OB1vNgJ0WiCBfmEA8fk,4658
 toolkits/databases/es_client.py,sha256=08VYRLMIKXz8FK9E_NDDdsKVrFLZdNwWLu4GzCAfQik,2904
 toolkits/databases/hive_client.py,sha256=3qPpGP2nlMOCULkvwvxbVLfgE1dVKztUmsuJGQaL79w,2154
 toolkits/databases/hive_cmd.py,sha256=pPr5-6z4y1Yx0J5GoCom2wBFD7x9HOSk8nDIYfZK7Pc,3652
 toolkits/databases/hive_helper.py,sha256=LCt4rff5meLJ1uCozPzL_S7rpGC8wOWvpe2pk0JXlsQ,8233
+toolkits/databases/mysql_helper.py,sha256=XI5b5oAkcqDQ8_r3cBDFjjHIv3ufACq22Ls9dq8XdKQ,6153
 toolkits/databases/redis_mgmt.py,sha256=f02qbYNGfvNGvmVfau5QMK6R92YusbZ-XcZnaRMpgWg,3386
 toolkits/databases/sql_helper.py,sha256=JHB9UtvXVhcZNVmuM9teWjsNoLYNxRn0RxQaZwi2N-8,9707
 toolkits/databases/sqlalchemy_helper.py,sha256=26lgOiJDNmuJpX0YWAzZkNylBFGlmaY4jnbcQJIY4Rg,2027
 toolkits/databases/status_check.py,sha256=12oeY94n5ZRnPoNSrY_P8uB6JMWMStAnuRO6gmTrm9w,6474
-toolkits/db_query_demo.py,sha256=0xPiOaAwY4ulZ91x4IhQ1gNRoOIHVk558FKGMAjnHGY,2577
+toolkits/db_query_demo.py,sha256=WgtXGNKrWK1lG2nuqh_0nYx59MuPOqu3eO27P_0ZBjc,2569
 toolkits/libs_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolkits/libs_core/config_groups_helper.py,sha256=k3ji_4iZVqTL5jB6xrIUKNbATM7Aoc0gAi7rJ1HyJeA,1987
-toolkits/libs_core/config_helper.py,sha256=t4j10aGcrOR6Zb6-qFZUgELO9tShPJs1NNIB3uVCuVg,494
-toolkits/libs_core/env_prepare.py,sha256=1zrxrdKcXR9eouEXuqfH03n1z8LSJ10QZ7HEogtA1_4,6103
 toolkits/libs_core/load_module.py,sha256=AAFPDx4_N6e3KdaI_LKciSqAD0zuHNfZxyu1FImk4o4,1325
-toolkits/libs_core/mysql_helper.py,sha256=XI5b5oAkcqDQ8_r3cBDFjjHIv3ufACq22Ls9dq8XdKQ,6153
 toolkits/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/network/ip_helper.py,sha256=VgSnQyXOAViAZuTnXeOZXtPiL38kbf3rD3-SUxRqNsM,665
 toolkits/network/pdi_helper.py,sha256=RR8Jdqyd-g1rnrf98UaZgOOks7Z1jcZFaWXzUbf4fQo,7406
@@ -42,7 +42,7 @@ toolkits/system/load_module.py,sha256=UXNfE9drsfz9oOBq9EGdV4gjmiIYlJQECIt3PFaLxw
 toolkits/system/priority_tasks.py,sha256=eUtKQatAnYcV3f3V3XY4FQ0u3afX8NHuqiBRcuv0d0I,7632
 toolkits/system/process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/system/process_monitor/process_monitor.py,sha256=_tXmWSOzAqAlHeGiBPrMGFU1Wjdr4zUAKNSPucqGRO8,12887
-toolkits/system/shell_helper.py,sha256=RwMw-t98IFjqo1DiqUL4GK0tRM4vSDj-Jqo623mEyRM,7999
+toolkits/system/shell_helper.py,sha256=BzQgPFj1Lg7QdhDxXFaZ9XlkZRIyixvEhZyoSXSdrDE,9099
 toolkits/system/str_helper.py,sha256=89qw0jF6Pf19uuMhBh7XFoCxHvEiZztPwlCDdYuPBEQ,5096
 toolkits/system/tasks_deamon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkits/system/tasks_deamon/tasks_controller.py,sha256=aobnJ0vJmvHQs94-yXasHqyxGsBHrv8Vqd1lq6JtmOo,2380
@@ -52,5 +52,5 @@ toolkits/system/test_shell_helper.py,sha256=zOCe-2BER1_x8t2NtiySWcd7K-PJEqL_zcIi
 toolkits/system/time_helper.py,sha256=_nxy97rnnagCn_m5sppZTDsx2sdn5debsTfXPEjoWzU,5644
 toolkits/system/win32_env.py,sha256=KYkZ-clZYkSQnSvPvpydeOVepaCrPH0egkC-MY-Bs0w,1829
 toolkits/tookits_app.py,sha256=2qz6V5XkEGc6NjxafFvFavE1hpt-tE0PoGonLAvZNXs,380
-toolkits/tookits_cli.py,sha256=f8u2IXYwk0QguQwY39aNjgVwJFiAmfukGGumWT6s07I,5273
-toolkits-0.2.7.dist-info/RECORD,,
+toolkits/tookits_cli.py,sha256=PZmhHLqm8rhLOl3_Fty6WPkW4UxIHMGcswxaHrOe_Ek,5274
+toolkits-0.2.8.dist-info/RECORD,,