Browse Source

Merge pull request #1333 from octodns/checksum-quiet-fix

Checksum visible in --quiet mode, logging fixes
pull/1335/head
Ross McFarland 3 weeks ago
committed by GitHub
parent
commit
09b98ae69f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 6 deletions
  1. +4
    -0
      .changelog/45575dea1d2949f58fc7989a5a57d4b5.md
  2. +4
    -0
      .changelog/be3a5f7895c84e7a829da3e9d57f8f99.md
  3. +2
    -1
      octodns/cmds/args.py
  4. +4
    -2
      octodns/manager.py
  5. +3
    -3
      octodns/provider/plan.py

+ 4
- 0
.changelog/45575dea1d2949f58fc7989a5a57d4b5.md View File

@ -0,0 +1,4 @@
---
type: patch
---
Use WARNING instead of deprecated WARN, fix log level alignment

+ 4
- 0
.changelog/be3a5f7895c84e7a829da3e9d57f8f99.md View File

@ -0,0 +1,4 @@
---
type: minor
---
Use dedicated Checksum logger so that checksum is visible in --quiet mode

+ 2
- 1
octodns/cmds/args.py View File

@ -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)


+ 4
- 2
octodns/manager.py View File

@ -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')


+ 3
- 3
octodns/provider/plan.py View File

@ -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):


Loading…
Cancel
Save