8000 Merge pull request #2243 from trail-of-forks/ww/recategorize-logs · theupdateframework/python-tuf@41a2035 · GitHub
[go: up one dir, main page]

Skip to content

Commit 41a2035

Browse files
authored
Merge pull request #2243 from trail-of-forks/ww/recategorize-logs
tuf: move INFO logs to DEBUG or WARNING
2 parents 0fb5924 + 7b89dd9 commit 41a2035

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

tuf/api/metadata.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,9 @@ def verify_delegate(
443443
key.verify_signature(delegated_metadata, signed_serializer)
444444
signing_keys.add(key.keyid)
445445
except exceptions.UnsignedMetadataError:
446-
logger.info("Key %s failed to verify %s", keyid, delegated_role)
446+
logger.debug(
447+
"Key %s failed to verify %s", keyid, delegated_role
448+
)
447449

448450
if len(signing_keys) < role.threshold:
449451
raise exceptions.UnsignedMetadataError(
@@ -776,7 +778,9 @@ def verify_signature(
776778
SerializationError,
777779
) as e:
778780
# Log unexpected failure, but continue as if there was no signature
779-
logger.info("Key %s failed to verify sig: %s", self.keyid, str(e))
781+
logger.warning(
782+
"Key %s failed to verify sig: %s", self.keyid, str(e)
783+
)
780784
raise exceptions.UnsignedMetadataError(
781785
f"Failed to verify {self.keyid} signature"
782786
) from e

tuf/ngclient/_internal/trusted_metadata_set.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def update_root(self, data: bytes) -> Metadata[Root]:
173173
new_root.verify_delegate(Root.type, new_root)
174174

175175
self._trusted_set[Root.type] = new_root
176-
logger.info("Updated root v%d", new_root.signed.version)
176+
logger.debug("Updated root v%d", new_root.signed.version)
177177

178178
return new_root
179179

@@ -243,7 +243,7 @@ def update_timestamp(self, data: bytes) -> Metadata[Timestamp]:
243243
# protection of new timestamp: expiry is checked in update_snapshot()
244244

245245
self._trusted_set[Timestamp.type] = new_timestamp
246-
logger.info("Updated timestamp v%d", new_timestamp.signed.version)
246+
logger.debug("Updated timestamp v%d", new_timestamp.signed.version)
247247

248248
# timestamp is loaded: raise if it is not valid _final_ timestamp
249249
self._check_final_timestamp()
@@ -338,7 +338,7 @@ def update_snapshot(
338338
# protection of new snapshot: it is checked when targets is updated
339339

340340
self._trusted_set[Snapshot.type] = new_snapshot
341-
logger.info("Updated snapshot v%d", new_snapshot.signed.version)
341+
logger.debug("Updated snapshot v%d", new_snapshot.signed.version)
342342

343343
# snapshot is loaded, but we raise if it's not valid _final_ snapshot
344344
self._check_final_snapshot()
@@ -433,7 +433,7 @@ def update_delegated_targets(
433433
raise exceptions.ExpiredMetadataError(f"New {role_name} is expired")
434434

435435
self._trusted_set[role_name] = new_delegate
436-
logger.info("Updated %s v%d", role_name, version)
436+
logger.debug("Updated %s v%d", role_name, version)
437437

438438
return new_delegate
439439

@@ -453,4 +453,4 @@ def _load_trusted_root(self, data: bytes) -> None:
453453
new_root.verify_delegate(Root.type, new_root)
454454

455455
self._trusted_set[Root.type] = new_root
456-
logger.info("Loaded trusted root v%d", new_root.signed.version)
456+
logger.debug("Loaded trusted root v%d", new_root.signed.version)

tuf/ngclient/updater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def download_target(
260260
with open(filepath, "wb") as destination_file:
261261
shutil.copyfileobj(target_file, destination_file)
262262

263-
logger.info("Downloaded target %s", targetinfo.path)
263+
logger.debug("Downloaded target %s", targetinfo.path)
264264
return filepath
265265

266266
def _download_metadata(

0 commit comments

Comments
 (0)
0