Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filter out handler with loglevel less than given level #519

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions python/fate_flow/entity/spec/dag/_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, level, formatters, delay, log_base_dir, aggregate_log_base_di
root_logger_dir = os.path.join(log_base_dir, "root")
# os.makedirs(root_logger_dir, exist_ok=True)
self._add_root_loggers(
log_base_dir=root_logger_dir, formatter_name="root", delay=delay
log_base_dir=root_logger_dir, formatter_name="root", delay=delay, loglevel=level
)

component_logger_dir = os.path.join(log_base_dir, "component")
Expand All @@ -72,12 +72,12 @@ def __init__(self, level, formatters, delay, log_base_dir, aggregate_log_base_di

# os.makedirs(aggregate_log_base_dir, exist_ok=True)
self._add_party_id_loggers(
aggregate_log_base_dir=aggregate_log_base_dir, formatter_name="root", delay=delay
aggregate_log_base_dir=aggregate_log_base_dir, formatter_name="root", delay=delay, loglevel=level
)

if aggregate_log_base_dir is not None:
self._add_aggregate_error_logger(
aggregate_log_base_dir, formatter_name="root", delay=delay
aggregate_log_base_dir, formatter_name="root", delay=delay,
)

def build(self):
Expand All @@ -91,16 +91,20 @@ def build(self):
disable_existing_loggers=self.disable_existing_loggers,
)

def _add_root_loggers(self, log_base_dir, formatter_name, delay):
def _add_root_loggers(self, log_base_dir, formatter_name, delay, loglevel):
for level in _LOGGER_LEVELS:
if logging.getLevelName(level) < logging.getLevelName(loglevel):
continue
handler_name = f"root_{level.lower()}"
self.handlers[handler_name] = self._create_file_handler(
level, formatter_name, delay, os.path.join(log_base_dir, level)
)
self.root["handlers"].append(handler_name)

def _add_party_id_loggers(self, aggregate_log_base_dir, formatter_name, delay):
def _add_party_id_loggers(self, aggregate_log_base_dir, formatter_name, delay, loglevel):
for level in _LOGGER_LEVELS:
if logging.getLevelName(level) < logging.getLevelName(loglevel):
continue
handler_name = f"root_party_{level.lower()}"
self.handlers[handler_name] = self._create_file_handler(
level, formatter_name, delay, os.path.join(aggregate_log_base_dir, level)
Expand All @@ -127,6 +131,8 @@ def _add_component_loggers(
# ERROR
component_handlers_names = []
for level in _LOGGER_LEVELS:
if logging.getLevelName(level) < logging.getLevelName(loglevel):
continue
handler_name = f"component_{level.lower()}"
self.handlers[handler_name] = self._create_file_handler(
level, formatter_name, delay, os.path.join(log_base_dir, level)
Expand Down