From be503efd3a4827d308dc8f7f3e959f4505716049 Mon Sep 17 00:00:00 2001 From: Kevin Cooper Date: Tue, 18 Apr 2017 10:56:40 -0400 Subject: [PATCH 1/2] Output the reasons for errors when failing to load source code --- React/Base/RCTBatchedBridge.m | 4 ++-- React/CxxBridge/RCTCxxBridge.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m index 2721f1537f065c..cc62cb56643f1b 100644 --- a/React/Base/RCTBatchedBridge.m +++ b/React/Base/RCTBatchedBridge.m @@ -210,7 +210,7 @@ - (void)loadSource:(RCTSourceLoadBlock)_onSourceLoad onProgress:(RCTSourceLoadPr if (error && [self.delegate respondsToSelector:@selector(fallbackSourceURLForBridge:)]) { NSURL *fallbackURL = [self.delegate fallbackSourceURLForBridge:self->_parentBridge]; if (fallbackURL && ![fallbackURL isEqual:self.bundleURL]) { - RCTLogError(@"Failed to load bundle(%@) with error:(%@)", self.bundleURL, error.localizedDescription); + RCTLogError(@"Failed to load bundle(%@) with error:(%@ %@)", self.bundleURL, error.localizedDescription, error.localizedFailureReason); self.bundleURL = fallbackURL; [RCTJavaScriptLoader loadBundleAtURL:self.bundleURL onProgress:onProgress onComplete:onSourceLoad]; return; @@ -513,7 +513,7 @@ - (void)executeSourceCode:(NSData *)sourceCode } if (loadError) { - RCTLogWarn(@"Failed to execute source code: %@", [loadError localizedDescription]); + RCTLogWarn(@"Failed to execute source code: %@ %@", [loadError localizedDescription], [loadError localizedFailureReason]); dispatch_async(dispatch_get_main_queue(), ^{ [self stopLoadingWithError:loadError]; }); diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 3605b1ca667f09..3760fe4bae7f63 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -356,7 +356,7 @@ - (void)loadSource:(RCTSourceLoadBlock)_onSourceLoad onProgress:(RCTSourceLoadPr if (error && [self.delegate respondsToSelector:@selector(fallbackSourceURLForBridge:)]) { NSURL *fallbackURL = [self.delegate fallbackSourceURLForBridge:self->_parentBridge]; if (fallbackURL && ![fallbackURL isEqual:self.bundleURL]) { - RCTLogError(@"Failed to load bundle(%@) with error:(%@)", self.bundleURL, error.localizedDescription); + RCTLogError(@"Failed to load bundle(%@) with error:(%@ %@)", self.bundleURL, error.localizedDescription, error.localizedFailureReason); self.bundleURL = fallbackURL; [RCTJavaScriptLoader loadBundleAtURL:self.bundleURL onProgress:onProgress onComplete:onSourceLoad]; return; From a22ee1e514fff33eb366361f2c8f02fbd3cdcd2d Mon Sep 17 00:00:00 2001 From: Kevin Cooper Date: Tue, 18 Apr 2017 11:59:16 -0400 Subject: [PATCH 2/2] Output warning when stack trace is undefined --- React/Base/RCTJSCErrorHandling.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/React/Base/RCTJSCErrorHandling.mm b/React/Base/RCTJSCErrorHandling.mm index 21dd74b85f77a0..3030c19b613e2d 100644 --- a/React/Base/RCTJSCErrorHandling.mm +++ b/React/Base/RCTJSCErrorHandling.mm @@ -13,6 +13,7 @@ #import "RCTAssert.h" #import "RCTJSStackFrame.h" +#import "RCTLog.h" NSString *const RCTJSExceptionUnsymbolicatedStackTraceKey = @"RCTJSExceptionUnsymbolicatedStackTraceKey"; @@ -25,7 +26,9 @@ userInfo[NSLocalizedFailureReasonErrorKey] = exceptionMessage; } NSString *const stack = [exception[@"stack"] toString]; - if ([stack length]) { + if ([@"undefined" isEqualToString:stack]) { + RCTLogWarn(@"Couldn't get stack trace for %@:%@", exception[@"sourceURL"], exception[@"line"]); + } else if ([stack length]) { NSArray *const unsymbolicatedFrames = [RCTJSStackFrame stackFramesWithLines:stack]; userInfo[RCTJSStackTraceKey] = unsymbolicatedFrames; }