diff --git a/.changelog/45575dea1d2949f58fc7989a5a57d4b5.md b/.changelog/45575dea1d2949f58fc7989a5a57d4b5.md new file mode 100644 index 0000000..aa567d9 --- /dev/null +++ b/.changelog/45575dea1d2949f58fc7989a5a57d4b5.md @@ -0,0 +1,4 @@ +--- +type: patch +--- +Use WARNING instead of deprecated WARN, fix log level alignment \ No newline at end of file diff --git a/.changelog/be3a5f7895c84e7a829da3e9d57f8f99.md b/.changelog/be3a5f7895c84e7a829da3e9d57f8f99.md new file mode 100644 index 0000000..d82a36a --- /dev/null +++ b/.changelog/be3a5f7895c84e7a829da3e9d57f8f99.md @@ -0,0 +1,4 @@ +--- +type: minor +--- +Use dedicated Checksum logger so that checksum is visible in --quiet mode \ No newline at end of file diff --git a/octodns/cmds/args.py b/octodns/cmds/args.py index 7e0ae7d..cd1cb9f 100644 --- a/octodns/cmds/args.py +++ b/octodns/cmds/args.py @@ -73,7 +73,8 @@ class ArgumentParser(_Base): # configuration return - fmt = '%(asctime)s [%(thread)d] %(levelname)-5s %(name)s %(message)s' + # 7 is the length of the largest logging level, warning, that we're concerned with aligning. + fmt = '%(asctime)s [%(thread)d] %(levelname)-7s %(name)s %(message)s' formatter = Formatter(fmt=fmt, datefmt='%Y-%m-%dT%H:%M:%S ') stream = stdout if args.log_stream_stdout else stderr handler = StreamHandler(stream=stream) diff --git a/octodns/manager.py b/octodns/manager.py index c14c7ea..bbc7be4 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -10,7 +10,7 @@ from importlib import import_module from importlib.metadata import PackageNotFoundError from importlib.metadata import version as module_version from json import dumps -from logging import getLogger +from logging import INFO, getLogger from re import compile as re_compile from sys import stdout @@ -896,7 +896,9 @@ class Manager(object): csum = sha256() csum.update(data.encode('utf-8')) computed_checksum = csum.hexdigest() - self.log.info('sync: checksum=%s', computed_checksum) + checksum_log = getLogger('Checksum') + checksum_log.setLevel(INFO) + checksum_log.info('checksum=%s', computed_checksum) if not force: self.log.debug('sync: checking safety') diff --git a/octodns/provider/plan.py b/octodns/provider/plan.py index 296afed..415b54e 100644 --- a/octodns/provider/plan.py +++ b/octodns/provider/plan.py @@ -5,7 +5,7 @@ from collections import defaultdict from io import StringIO from json import dumps -from logging import DEBUG, ERROR, INFO, WARN, getLogger +from logging import DEBUG, ERROR, INFO, WARNING, getLogger from pprint import pformat from sys import stdout @@ -152,8 +152,8 @@ class PlanLogger(_PlanOutput): self.level = { 'debug': DEBUG, 'info': INFO, - 'warn': WARN, - 'warning': WARN, + 'warn': WARNING, + 'warning': WARNING, 'error': ERROR, }[level.lower()] except (AttributeError, KeyError):