Skip to content

Commit d212abd

Browse files
committed
Add logger and update dev version
Add logger and update dev version
1 parent e6ef791 commit d212abd

File tree

12 files changed

+56
-20
lines changed

12 files changed

+56
-20
lines changed

.idea/workspace.xml

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "je_auto_control_dev"
9-
version = "0.0.81"
9+
version = "0.0.82"
1010
authors = [
1111
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
1212
]

je_auto_control/utils/executor/action_executor.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml
1616
from je_auto_control.utils.generate_report.generate_xml_report import generate_xml_report
1717
from je_auto_control.utils.json.json_file import read_action_json
18+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
1819
from je_auto_control.utils.package_manager.package_manager_class import package_manager
1920
from je_auto_control.utils.project.create_project_structure import create_project_dir
2021
from je_auto_control.utils.shell_process.shell_exec import ShellManager
@@ -111,6 +112,7 @@ def execute_action(self, action_list: [list, dict]) -> dict:
111112
:param action_list the list include action
112113
for loop the list and execute action
113114
"""
115+
auto_control_logger.info(f"execute_action, action_list: {action_list}")
114116
if isinstance(action_list, dict):
115117
action_list: list = action_list.get("auto_control", None)
116118
if action_list is None:
@@ -123,15 +125,18 @@ def execute_action(self, action_list: [list, dict]) -> dict:
123125
raise AutoControlActionNullException(action_is_null_error)
124126
except Exception as error:
125127
record_action_to_list("execute_action", action_list, repr(error))
126-
print(repr(error), file=sys.stderr, flush=True)
128+
auto_control_logger.info(
129+
f"execute_action, action_list: {action_list}, "
130+
f"failed: {repr(error)}")
127131
for action in action_list:
128132
try:
129133
event_response = self._execute_event(action)
130134
execute_record = "execute: " + str(action)
131135
execute_record_dict.update({execute_record: event_response})
132136
except Exception as error:
133-
print(repr(error), file=sys.stderr, flush=True)
134-
print(action, file=sys.stderr, flush=True)
137+
auto_control_logger.info(
138+
f"execute_action, action_list: {action_list}, "
139+
f"action: {action}, failed: {repr(error)}")
135140
record_action_to_list("execute_action", None, repr(error))
136141
execute_record = "execute: " + str(action)
137142
execute_record_dict.update({execute_record: repr(error)})
@@ -145,6 +150,7 @@ def execute_files(self, execute_files_list: list) -> list:
145150
:param execute_files_list: list include execute files path
146151
:return: every execute detail as list
147152
"""
153+
auto_control_logger.info(f"execute_files, execute_files_list: {execute_files_list}")
148154
execute_detail_list: list = list()
149155
for file in execute_files_list:
150156
execute_detail_list.append(self.execute_action(read_action_json(file)))

je_auto_control/utils/generate_report/generate_html_report.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from je_auto_control.utils.exception.exception_tags import html_generate_no_data_tag
66
from je_auto_control.utils.exception.exceptions import AutoControlHTMLException
7+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
78
from je_auto_control.utils.test_record.record_test_class import test_record_instance
89

910
_lock = Lock()
@@ -130,6 +131,7 @@ def make_html_table(event_str: str, record_data: dict, table_head: str) -> str:
130131

131132

132133
def generate_html() -> str:
134+
auto_control_logger.info("generate_html")
133135
"""
134136
this function will create html string
135137
:return: html_string
@@ -149,6 +151,7 @@ def generate_html() -> str:
149151

150152

151153
def generate_html_report(html_name: str = "default_name"):
154+
auto_control_logger.info(f"generate_html_report, html_name: {html_name}")
152155
"""
153156
Output html report file
154157
:param html_name: save html file name
@@ -161,6 +164,7 @@ def generate_html_report(html_name: str = "default_name"):
161164
new_html_string
162165
)
163166
except Exception as error:
164-
print(repr(error), file=sys.stderr)
167+
auto_control_logger.error(
168+
f"generate_html_report, html_name: {html_name}, failed: {repr(error)}")
165169
finally:
166170
_lock.release()

je_auto_control/utils/generate_report/generate_json_report.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
from je_auto_control.utils.exception.exception_tags import cant_generate_json_report
66
from je_auto_control.utils.exception.exceptions import AutoControlGenerateJsonReportException
7+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
78
from je_auto_control.utils.test_record.record_test_class import test_record_instance
89

910

1011
def generate_json():
12+
auto_control_logger.info("generate_json")
1113
"""
1214
:return: two dict {success_dict}, {failure_dict}
1315
"""
@@ -49,6 +51,7 @@ def generate_json():
4951

5052

5153
def generate_json_report(json_file_name: str = "default_name"):
54+
auto_control_logger.info(f"generate_json_report, json_file_name: {json_file_name}")
5255
"""
5356
Output json report file
5457
:param json_file_name: save json file's name
@@ -60,14 +63,18 @@ def generate_json_report(json_file_name: str = "default_name"):
6063
with open(json_file_name + "_success.json", "w+") as file_to_write:
6164
json.dump(dict(success_dict), file_to_write, indent=4)
6265
except Exception as error:
63-
print(repr(error), file=sys.stderr)
66+
auto_control_logger.error(
67+
f"generate_json_report, json_file_name: {json_file_name}, "
68+
f"failed: {repr(error)}")
6469
finally:
6570
lock.release()
6671
lock.acquire()
6772
try:
6873
with open(json_file_name + "_failure.json", "w+") as file_to_write:
6974
json.dump(dict(failure_dict), file_to_write, indent=4)
7075
except Exception as error:
71-
print(repr(error), file=sys.stderr)
76+
auto_control_logger.error(
77+
f"generate_json_report, json_file_name: {json_file_name}, "
78+
f"failed: {repr(error)}")
7279
finally:
7380
lock.release()

je_auto_control/utils/generate_report/generate_xml_report.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import sys
22
from threading import Lock
33
from xml.dom.minidom import parseString
4+
45
from je_auto_control.utils.generate_report.generate_json_report import generate_json
6+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
57
from je_auto_control.utils.xml.change_xml_structure.change_xml_structure import dict_to_elements_tree
68

79

810
def generate_xml():
11+
auto_control_logger.info("generate_xml")
912
"""
1013
:return: two dict {success_dict}, {failure_dict}
1114
"""
@@ -18,6 +21,7 @@ def generate_xml():
1821

1922

2023
def generate_xml_report(xml_file_name: str = "default_name"):
24+
auto_control_logger.info(f"generate_xml_report, xml_file_name: {xml_file_name}")
2125
"""
2226
:param xml_file_name: save xml file name
2327
"""
@@ -32,7 +36,9 @@ def generate_xml_report(xml_file_name: str = "default_name"):
3236
with open(xml_file_name + "_failure.xml", "w+") as file_to_write:
3337
file_to_write.write(failure_xml)
3438
except Exception as error:
35-
print(repr(error), file=sys.stderr)
39+
auto_control_logger.error(
40+
f"generate_xml_report, xml_file_name: {xml_file_name}, "
41+
f"failed: {repr(error)}")
3642
finally:
3743
lock.release()
3844
lock.acquire()
@@ -41,7 +47,9 @@ def generate_xml_report(xml_file_name: str = "default_name"):
4147
file_to_write.write(success_xml)
4248
pass
4349
except Exception as error:
44-
print(repr(error), file=sys.stderr)
50+
auto_control_logger.error(
51+
f"generate_xml_report, xml_file_name: {xml_file_name}, "
52+
f"failed: {repr(error)}")
4553
finally:
4654
lock.release()
4755

je_auto_control/utils/package_manager/package_manager_class.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from inspect import getmembers, isfunction, isbuiltin, isclass
44
from sys import stderr
55

6+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
7+
68

79
class PackageManager(object):
810

@@ -29,6 +31,7 @@ def check_package(self, package: str):
2931
return self.installed_package_dict.get(package, None)
3032

3133
def add_package_to_executor(self, package):
34+
auto_control_logger.info(f"add_package_to_executor, package: {package}")
3235
"""
3336
:param package: package's function will add to executor
3437
"""
@@ -38,6 +41,7 @@ def add_package_to_executor(self, package):
3841
)
3942

4043
def add_package_to_callback_executor(self, package):
44+
auto_control_logger.info(f"add_package_to_callback_executor, package: {package}")
4145
"""
4246
:param package: package's function will add to callback_executor
4347
"""

je_auto_control/utils/project/create_project_structure.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from threading import Lock
44

55
from je_auto_control.utils.json.json_file import write_action_json
6+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
67
from je_auto_control.utils.project.template.template_executor import executor_template_1, \
78
executor_template_2, bad_executor_template_1
89
from je_auto_control.utils.project.template.template_keyword import template_keyword_1, \
@@ -59,6 +60,7 @@ def create_template(parent_name: str, project_path: str = None) -> None:
5960

6061

6162
def create_project_dir(project_path: str = None, parent_name: str = "AutoControl") -> None:
63+
auto_control_logger.info(f"create_project_dir, project_path: {project_path}, parent_name: {parent_name}")
6264
if project_path is None:
6365
project_path = getcwd()
6466
create_dir(project_path + "/" + parent_name + "/keyword")

je_auto_control/utils/shell_process/shell_exec.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import sys
55
from threading import Thread
66

7+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
8+
79

810
class ShellManager(object):
911

@@ -30,6 +32,7 @@ def exec_shell(self, shell_command: [str, list]) -> None:
3032
:param shell_command: shell command will run
3133
:return: if error return result and True else return result and False
3234
"""
35+
auto_control_logger.info(f"exec_shell, shell_command: {shell_command}")
3336
try:
3437
self.exit_program()
3538
if sys.platform in ["win32", "cygwin", "msys"]:
@@ -56,7 +59,8 @@ def exec_shell(self, shell_command: [str, list]) -> None:
5659
)
5760
self.read_program_error_output_from_thread.start()
5861
except Exception as error:
59-
print(repr(error), file=sys.stderr)
62+
auto_control_logger.error(
63+
f"exec_shell, shell_command: {shell_command}, failed: {repr(error)}")
6064

6165
# tkinter_ui update method
6266
def pull_text(self) -> None:

je_auto_control/utils/start_exe/start_another_process.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
from je_auto_control.utils.exception.exception_tags import can_not_find_file
44
from je_auto_control.utils.exception.exceptions import AutoControlException
5+
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
56

67
from je_auto_control.utils.shell_process.shell_exec import ShellManager
78

89

910
def start_exe(exe_path: str):
11+
auto_control_logger.info(f"start_exe, exe_path: {exe_path}")
1012
exe_path = Path(exe_path)
1113
if exe_path.exists() and exe_path.is_file():
1214
process_manager = ShellManager()
1315
process_manager.exec_shell(str(exe_path))
1416
else:
17+
auto_control_logger.error(
18+
f"start_exe, exe_path: {exe_path}, failed: {AutoControlException(can_not_find_file)}")
1519
raise AutoControlException(can_not_find_file)

0 commit comments

Comments
 (0)