From 1dffd056bffb0f1cbfa91d2150db839f2e9544f1 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Wed, 20 Jan 2016 10:27:34 -0800 Subject: [PATCH] Fix default logger's loglevel, improve default error handler Reviewed By: majak Differential Revision: D2834267 fb-gh-sync-id: c89ce5160f03f57409497cc802690c8360d88a4d --- React/Base/RCTLog.m | 2 +- .../src/Resolver/polyfills/error-guard.js | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/React/Base/RCTLog.m b/React/Base/RCTLog.m index 28562bde2..efcc12659 100644 --- a/React/Base/RCTLog.m +++ b/React/Base/RCTLog.m @@ -163,7 +163,7 @@ NSString *RCTFormatLog( [log appendString:[formatter stringFromDate:timestamp]]; } if (level) { - [log appendFormat:@"[%s]", RCTLogLevels[level - 1]]; + [log appendFormat:@"[%s]", RCTLogLevels[level]]; } [log appendFormat:@"[tid:%@]", RCTCurrentThreadName()]; diff --git a/packager/react-packager/src/Resolver/polyfills/error-guard.js b/packager/react-packager/src/Resolver/polyfills/error-guard.js index d4aa41225..ac99cadca 100644 --- a/packager/react-packager/src/Resolver/polyfills/error-guard.js +++ b/packager/react-packager/src/Resolver/polyfills/error-guard.js @@ -72,17 +72,12 @@ /** * This is the error handler that is called when we encounter an exception - * when loading a module. + * when loading a module. This will report any errors encountered before + * ExceptionsManager is configured. */ function setupErrorGuard() { var onError = function(e) { - global.console.error( - 'Error: ' + - '\n stack: ' + e.stack + - '\n line: ' + e.line + - '\n message: ' + e.message, - e - ); + global.console.error('Error: ' + e.message + ', stack:\n' + e.stack); }; global.ErrorUtils.setGlobalHandler(onError); }