Skip to content

Commit 40a5aaa

Browse files
committed
Also handle resource resolver errors gracefully in the GracefulResourceRenderer.
1 parent 80172d3 commit 40a5aaa

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 error messages by including more detailed information.
811
[thet]
912

webresource/_api.py

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

741741
def render(self):
742742
lines = []
743-
for resource in self.resolver.resolve():
743+
resources = []
744+
try:
745+
resources = self.resolver.resolve()
746+
except (
747+
ResourceConflictError,
748+
ResourceCircularDependencyError,
749+
ResourceMissingDependencyError,
750+
) as e:
751+
error_message = str(e)
752+
logger.exception(error_message)
753+
754+
for resource in resources:
744755
error_message = None
745756
try:
746757
lines.append(resource.render(self.base_url))

0 commit comments

Comments
 (0)