Skip to content

Commit e319827

Browse files
committed
Improve resource render errors by including more detailed error messages.
1 parent d296de6 commit e319827

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

CHANGES.rst

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

7+
- Improve resource render errors by including more detailed error messages.
8+
[thet]
9+
710
- Improve ResourceError messages by including the resource/group/member names.
811
[thet]
912

@@ -71,7 +74,7 @@ Changelog
7174
Modernize setup.[py|cfg].
7275
[jensens]
7376

74-
- Added ``GracefulResourceRenderer``.
77+
- Added ``GracefulResourceRenderer``.
7578
Fixes #1.
7679
[jensens]
7780

webresource/_api.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -738,10 +738,19 @@ class GracefulResourceRenderer(ResourceRenderer):
738738
def render(self):
739739
lines = []
740740
for resource in self.resolver.resolve():
741+
error_message = None
741742
try:
742743
lines.append(resource.render(self.base_url))
743-
except (ResourceError, FileNotFoundError):
744-
msg = u'Failure to render resource "{}"'.format(resource.name)
745-
lines.append(u'<!-- {} - details in logs -->'.format(msg))
746-
logger.exception(msg)
744+
except FileNotFoundError:
745+
error_message = u'File not found for resource "{}"'.format(
746+
resource.name
747+
)
748+
except ResourceError as e:
749+
error_message = str(e)
750+
finally:
751+
if error_message:
752+
lines.append(u'<!-- {} - details in logs -->'.format(
753+
error_message
754+
))
755+
logger.exception(error_message)
747756
return u'\n'.join(lines)

0 commit comments

Comments
 (0)