Skip to content

Commit 05b2114

Browse files
justisbjustin808
authored andcommitted
Fix server rendering rescue (#1020)
* Fix server rendering rescue
1 parent 9ad4391 commit 05b2114

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Changes since last non-beta release.
88

99
*Please add entries here for your pull requests that are not yet released.*
1010

11+
#### Fixed
12+
- Fixed issue with server-rendering error handler: [PR 1020](https://github.com/shakacode/react_on_rails/pull/1020) by [jblasco3](https://github.com/jblasco3).
13+
1114
### [10.1.0] - 2018-01-23
1215
#### Added
1316
- Added 2 cache helpers: ReactOnRails::Utils.bundle_file_name(bundle_name) and ReactOnRails::Utils.server_bundle_file_name

lib/react_on_rails/server_rendering_pool/exec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def create_js_context
9898
# bundle_js_code = File.read(server_js_file)
9999
begin
100100
bundle_js_code = open(server_js_file, &:read)
101-
rescue StandardError
101+
rescue StandardError => e
102102
msg = "You specified server rendering JS file: #{server_js_file}, but it cannot be "\
103103
"read. You may set the server_bundle_js_file in your configuration to be \"\" to "\
104104
"avoid this warning.\nError is: #{e}"
@@ -115,7 +115,7 @@ def create_js_context
115115
begin
116116
trace_messsage(base_js_code, file_name)
117117
ExecJS.compile(base_js_code)
118-
rescue StandardError
118+
rescue StandardError => e
119119
msg = "ERROR when compiling base_js_code! "\
120120
"See file #{file_name} to "\
121121
"correlate line numbers of error. Error is\n\n#{e.message}"\

0 commit comments

Comments
 (0)