Skip to content

Commit e0a53ab

Browse files
committed
Also handle resource resolver errors gracefully in the GracefulResourceRenderer.
1 parent e319827 commit e0a53ab

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

CHANGES.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Changelog
44
1.3 (unreleased)
55
----------------
66

7+
- Also handle resource resolver errors gracefully in the GracefulResourceRenderer.
8+
[thet]
9+
710
- Improve resource render errors by including more detailed error messages.
811
[thet]
912

webresource/_api.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,18 @@ class GracefulResourceRenderer(ResourceRenderer):
737737

738738
def render(self):
739739
lines = []
740-
for resource in self.resolver.resolve():
740+
resources = []
741+
try:
742+
resources = self.resolver.resolve()
743+
except (
744+
ResourceConflictError,
745+
ResourceCircularDependencyError,
746+
ResourceMissingDependencyError,
747+
) as e:
748+
error_message = str(e)
749+
logger.exception(error_message)
750+
751+
for resource in resources:
741752
error_message = None
742753
try:
743754
lines.append(resource.render(self.base_url))

0 commit comments

Comments
 (0)