Skip to content

Commit

Permalink
Fix file logging level issue.
Browse files Browse the repository at this point in the history
Fixes #223
  • Loading branch information
tpapaioa committed Apr 18, 2024
1 parent 5fa99d9 commit 93b846d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion broker/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,8 @@ def fork_broker():
if pid:
logger.info(f"Running broker in the background with pid: {pid}")
sys.exit(0)
update_log_level(None, None, "silent")
b_log.set_log_level("silent")
b_log.set_file_logging("silent")


def handle_keyboardinterrupt(*args):
Expand Down
9 changes: 8 additions & 1 deletion broker/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,12 @@ def set_file_logging(level=settings.logging.file_level, path="logs/broker.log"):
silent = True
log_level = LOG_LEVEL.INFO
else:
log_level = resolve_log_level(level)
# Allow override of file logging level with --log-level, if the new level is lower than
# settings.logging.file_level. Otherwise, use the value from settings.
old_log_level = resolve_log_level(settings.logging.file_level)
new_log_level = resolve_log_level(level)
log_level = new_log_level if new_log_level.value < old_log_level.value else old_log_level

path = BROKER_DIRECTORY.joinpath(path)
path.parent.mkdir(parents=True, exist_ok=True)
logzero.logfile(
Expand All @@ -138,6 +143,8 @@ def setup_logzero(
):
"""Call logzero setup with the given settings."""
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
# FIXME helpers.update_log_level also needs to do this,
# if "--log-level trace" is passed to the CLI.
if isinstance(level, str) and level.lower() == "trace":
patch_awx_for_verbosity(awxkit.api)
set_log_level(level)
Expand Down

0 comments on commit 93b846d

Please sign in to comment.