You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2015/10/16 15:15:06 UTC
[3/3] cordova-cli git commit: CB-9792 Make CLI logging system
interrupt process on an error event
CB-9792 Make CLI logging system interrupt process on an error event
Adds "Error: " prefix for backwards compatibility with external tools
github: close #224
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/38bdd5ef
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/38bdd5ef
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/38bdd5ef
Branch: refs/heads/master
Commit: 38bdd5ef064613150c66b13ee1ca377481aae1e6
Parents: 605bcc2
Author: daserge <v-...@microsoft.com>
Authored: Thu Oct 15 15:48:18 2015 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Fri Oct 16 16:10:54 2015 +0300
----------------------------------------------------------------------
src/cli.js | 9 ++-------
src/logger.js | 5 +++++
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/38bdd5ef/src/cli.js
----------------------------------------------------------------------
diff --git a/src/cli.js b/src/cli.js
index fdf59be..9326023 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -130,12 +130,8 @@ function cli(inputArgs) {
// For CordovaError print only the message without stack trace unless we
// are in a verbose mode.
- process.on('uncaughtException', function(err){
- if ( (err instanceof CordovaError) && !args.verbose ) {
- events.emit('error', err.message);
- } else {
- events.emit('error', err.stack);
- }
+ process.on('uncaughtException', function(err) {
+ logger.error(err);
process.exit(1);
});
@@ -143,7 +139,6 @@ function cli(inputArgs) {
events.on('log', logger.normal);
events.on('info', logger.info);
events.on('warn', logger.warn);
- events.on('error', logger.error);
// Set up event handlers for logging and results emitted as events.
events.on('results', logger.results);
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/38bdd5ef/src/logger.js
----------------------------------------------------------------------
diff --git a/src/logger.js b/src/logger.js
index 8c0ece0..93c3d55 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -51,6 +51,11 @@ function formatError(error, isVerbose) {
message = error;
}
+ if(message.toUpperCase().indexOf('ERROR:') !== 0) {
+ // Needed for backward compatibility with external tools
+ message = 'Error: ' + message;
+ }
+
return message;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org