Skip to content

Commit e0b83a2

Browse files
committed
Update logger
Update logger
1 parent 228359f commit e0b83a2

19 files changed

+185
-160
lines changed

.idea/workspace.xml

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

dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
je_auto_control_dev
22
wheel
3+
build
34
twine
45
sphinx
56
sphinx-rtd-theme

je_auto_control/utils/executor/action_executor.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +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
18+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
1919
from je_auto_control.utils.package_manager.package_manager_class import package_manager
2020
from je_auto_control.utils.project.create_project_structure import create_project_dir
2121
from je_auto_control.utils.scheduler.extend_apscheduler import scheduler_manager
@@ -122,7 +122,7 @@ def execute_action(self, action_list: [list, dict]) -> Dict[str, str]:
122122
:param action_list the list include action
123123
for loop the list and execute action
124124
"""
125-
auto_control_logger.info(f"execute_action, action_list: {action_list}")
125+
autocontrol_logger.info(f"execute_action, action_list: {action_list}")
126126
if isinstance(action_list, dict):
127127
action_list: list = action_list.get("auto_control")
128128
if action_list is None:
@@ -133,7 +133,7 @@ def execute_action(self, action_list: [list, dict]) -> Dict[str, str]:
133133
raise AutoControlActionNullException(action_is_null_error)
134134
except Exception as error:
135135
record_action_to_list("AC_execute_action", action_list, repr(error))
136-
auto_control_logger.info(
136+
autocontrol_logger.info(
137137
f"execute_action, action_list: {action_list}, "
138138
f"failed: {repr(error)}")
139139
for action in action_list:
@@ -142,7 +142,7 @@ def execute_action(self, action_list: [list, dict]) -> Dict[str, str]:
142142
execute_record = "execute: " + str(action)
143143
execute_record_dict.update({execute_record: event_response})
144144
except Exception as error:
145-
auto_control_logger.info(
145+
autocontrol_logger.info(
146146
f"execute_action, action_list: {action_list}, "
147147
f"action: {action}, failed: {repr(error)}")
148148
record_action_to_list("AC_execute_action", None, repr(error))
@@ -158,7 +158,7 @@ def execute_files(self, execute_files_list: list) -> List[Dict[str, str]]:
158158
:param execute_files_list: list include execute files path
159159
:return: every execute detail as list
160160
"""
161-
auto_control_logger.info(f"execute_files, execute_files_list: {execute_files_list}")
161+
autocontrol_logger.info(f"execute_files, execute_files_list: {execute_files_list}")
162162
execute_detail_list: list = list()
163163
for file in execute_files_list:
164164
execute_detail_list.append(self.execute_action(read_action_json(file)))

je_auto_control/utils/generate_report/generate_html_report.py

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

33
from je_auto_control.utils.exception.exception_tags import html_generate_no_data_tag
44
from je_auto_control.utils.exception.exceptions import AutoControlHTMLException
5-
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
5+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
66
from je_auto_control.utils.test_record.record_test_class import test_record_instance
77

88
_lock = Lock()
@@ -129,7 +129,7 @@ def make_html_table(event_str: str, record_data: dict, table_head: str) -> str:
129129

130130

131131
def generate_html() -> str:
132-
auto_control_logger.info("generate_html")
132+
autocontrol_logger.info("generate_html")
133133
""" this function will create html string
134134
:return: html_string """
135135
if len(test_record_instance.test_record_list) == 0:
@@ -147,7 +147,7 @@ def generate_html() -> str:
147147

148148

149149
def generate_html_report(html_name: str = "default_name") -> None:
150-
auto_control_logger.info(f"generate_html_report, html_name: {html_name}")
150+
autocontrol_logger.info(f"generate_html_report, html_name: {html_name}")
151151
"""
152152
Output html report file
153153
:param html_name: save html file name
@@ -160,7 +160,7 @@ def generate_html_report(html_name: str = "default_name") -> None:
160160
new_html_string
161161
)
162162
except Exception as error:
163-
auto_control_logger.error(
163+
autocontrol_logger.error(
164164
f"generate_html_report, html_name: {html_name}, failed: {repr(error)}")
165165
finally:
166166
_lock.release()

je_auto_control/utils/generate_report/generate_json_report.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +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
7+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
88
from je_auto_control.utils.test_record.record_test_class import test_record_instance
99

1010

1111
def generate_json() -> Tuple[Dict[str, Dict[str, str]], Dict[str, Dict[str, str]]]:
12-
auto_control_logger.info("generate_json")
12+
autocontrol_logger.info("generate_json")
1313
"""
1414
:return: two dict {success_dict}, {failure_dict}
1515
"""
@@ -51,7 +51,7 @@ def generate_json() -> Tuple[Dict[str, Dict[str, str]], Dict[str, Dict[str, str]
5151

5252

5353
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}")
54+
autocontrol_logger.info(f"generate_json_report, json_file_name: {json_file_name}")
5555
"""
5656
Output json report file
5757
:param json_file_name: save json file's name
@@ -63,7 +63,7 @@ def generate_json_report(json_file_name: str = "default_name"):
6363
with open(json_file_name + "_success.json", "w+") as file_to_write:
6464
json.dump(dict(success_dict), file_to_write, indent=4)
6565
except Exception as error:
66-
auto_control_logger.error(
66+
autocontrol_logger.error(
6767
f"generate_json_report, json_file_name: {json_file_name}, "
6868
f"failed: {repr(error)}")
6969
finally:
@@ -73,7 +73,7 @@ def generate_json_report(json_file_name: str = "default_name"):
7373
with open(json_file_name + "_failure.json", "w+") as file_to_write:
7474
json.dump(dict(failure_dict), file_to_write, indent=4)
7575
except Exception as error:
76-
auto_control_logger.error(
76+
autocontrol_logger.error(
7777
f"generate_json_report, json_file_name: {json_file_name}, "
7878
f"failed: {repr(error)}")
7979
finally:

je_auto_control/utils/generate_report/generate_xml_report.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from xml.dom.minidom import parseString
44

55
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
6+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
77
from je_auto_control.utils.xml.change_xml_structure.change_xml_structure import dict_to_elements_tree
88

99

1010
def generate_xml() -> Tuple[Union[str, bytes], Union[str, bytes]]:
11-
auto_control_logger.info("generate_xml")
11+
autocontrol_logger.info("generate_xml")
1212
"""
1313
:return: two dict {success_dict}, {failure_dict}
1414
"""
@@ -21,7 +21,7 @@ def generate_xml() -> Tuple[Union[str, bytes], Union[str, bytes]]:
2121

2222

2323
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}")
24+
autocontrol_logger.info(f"generate_xml_report, xml_file_name: {xml_file_name}")
2525
"""
2626
:param xml_file_name: save xml file name
2727
"""
@@ -36,7 +36,7 @@ def generate_xml_report(xml_file_name: str = "default_name"):
3636
with open(xml_file_name + "_failure.xml", "w+") as file_to_write:
3737
file_to_write.write(failure_xml)
3838
except Exception as error:
39-
auto_control_logger.error(
39+
autocontrol_logger.error(
4040
f"generate_xml_report, xml_file_name: {xml_file_name}, "
4141
f"failed: {repr(error)}")
4242
finally:
@@ -46,7 +46,7 @@ def generate_xml_report(xml_file_name: str = "default_name"):
4646
with open(xml_file_name + "_success.xml", "w+") as file_to_write:
4747
file_to_write.write(success_xml)
4848
except Exception as error:
49-
auto_control_logger.error(
49+
autocontrol_logger.error(
5050
f"generate_xml_report, xml_file_name: {xml_file_name}, "
5151
f"failed: {repr(error)}")
5252
finally:
Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
import logging
2-
import sys
32

4-
auto_control_logger = logging.getLogger("AutoControl")
5-
auto_control_logger.setLevel(logging.INFO)
3+
logging.root.setLevel(logging.DEBUG)
4+
autocontrol_logger = logging.getLogger("AutoControlGUI")
65
formatter = logging.Formatter('%(asctime)s | %(name)s | %(levelname)s | %(message)s')
7-
# Stream handler
8-
stream_handler = logging.StreamHandler(stream=sys.stderr)
9-
stream_handler.setFormatter(formatter)
10-
stream_handler.setLevel(logging.WARNING)
11-
auto_control_logger.addHandler(stream_handler)
126
# File handler
13-
file_handler = logging.FileHandler(filename="AutoControl.log", mode="w")
7+
file_handler = logging.FileHandler(filename="AutoControlGUI.log", mode="w")
148
file_handler.setFormatter(formatter)
15-
auto_control_logger.addHandler(file_handler)
9+
autocontrol_logger.addHandler(file_handler)
10+
11+
class APITestkaLoggingHandler(logging.Handler):
12+
13+
# redirect logging stderr output to queue
14+
15+
def __init__(self):
16+
super().__init__()
17+
self.formatter = formatter
18+
self.setLevel(logging.DEBUG)
19+
20+
def emit(self, record: logging.LogRecord) -> None:
21+
print(self.format(record))
22+
23+
24+
# Stream handler
25+
autocontrol_logger.addHandler(APITestkaLoggingHandler())

je_auto_control/utils/package_manager/package_manager_class.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from sys import stderr
55
from typing import Union, Callable, Dict
66

7-
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
7+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
88

99

1010
class PackageManager(object):
@@ -32,7 +32,7 @@ def check_package(self, package: str) -> Union[None, Dict[str, Callable]]:
3232
return self.installed_package_dict.get(package, None)
3333

3434
def add_package_to_executor(self, package) -> None:
35-
auto_control_logger.info(f"add_package_to_executor, package: {package}")
35+
autocontrol_logger.info(f"add_package_to_executor, package: {package}")
3636
"""
3737
:param package: package's function will add to executor
3838
"""
@@ -42,7 +42,7 @@ def add_package_to_executor(self, package) -> None:
4242
)
4343

4444
def add_package_to_callback_executor(self, package) -> None:
45-
auto_control_logger.info(f"add_package_to_callback_executor, package: {package}")
45+
autocontrol_logger.info(f"add_package_to_callback_executor, package: {package}")
4646
"""
4747
:param package: package's function will add to callback_executor
4848
"""

je_auto_control/utils/project/create_project_structure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +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
6+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
77
from je_auto_control.utils.project.template.template_executor import executor_template_1, \
88
executor_template_2, bad_executor_template_1
99
from je_auto_control.utils.project.template.template_keyword import template_keyword_1, \
@@ -60,7 +60,7 @@ def create_template(parent_name: str, project_path: str = None) -> None:
6060

6161

6262
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}")
63+
autocontrol_logger.info(f"create_project_dir, project_path: {project_path}, parent_name: {parent_name}")
6464
if project_path is None:
6565
project_path = getcwd()
6666
create_dir(project_path + "/" + parent_name + "/keyword")

je_auto_control/utils/shell_process/shell_exec.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import sys
55
from threading import Thread
66

7-
from je_auto_control.utils.logging.loggin_instance import auto_control_logger
7+
from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
88

99

1010
class ShellManager(object):
@@ -32,7 +32,7 @@ def exec_shell(self, shell_command: [str, list]) -> None:
3232
:param shell_command: shell command will run
3333
:return: if error return result and True else return result and False
3434
"""
35-
auto_control_logger.info(f"exec_shell, shell_command: {shell_command}")
35+
autocontrol_logger.info(f"exec_shell, shell_command: {shell_command}")
3636
try:
3737
self.exit_program()
3838
if sys.platform in ["win32", "cygwin", "msys"]:
@@ -59,7 +59,7 @@ def exec_shell(self, shell_command: [str, list]) -> None:
5959
)
6060
self.read_program_error_output_from_thread.start()
6161
except Exception as error:
62-
auto_control_logger.error(
62+
autocontrol_logger.error(
6363
f"exec_shell, shell_command: {shell_command}, failed: {repr(error)}")
6464

6565
# tkinter_ui update method

0 commit comments

Comments
 (0)