exit with error code if necessary

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/cli.js

@@ -98,7 +98,7 @@ cli.run = function() {
   initLogLevel();
   initDir()
   initPlugins(function(e) {
-    if (e) return log.error(e);
+    if (e) return log.fatal(e);
     cache.init();
     runCommand();
   });

lib/commands/config.js

@@ -75,14 +75,14 @@ cmd.handler = function(argv) {
 
   // delete
   if (argv.delete) {
-    if (v === undefined) return log.error('Key not found: ' + argv.key);
+    if (v === undefined) return log.fatal('Key not found: ' + argv.key);
     nconf.clear(argv.key);
     return saveConfig();
   }
 
   // show
   if (argv.value.length === 0) {
-    if (v === undefined) return log.error('Key not found: ' + argv.key);
+    if (v === undefined) return log.fatal('Key not found: ' + argv.key);
     return log.info(prettyConfig(v));
   }
 

lib/commands/plugin.js

@@ -80,7 +80,7 @@ cmd.handler = function(argv) {
 
   if (argv.install) {
     const cb = function(e, p) {
-      if (e) return log.error(e);
+      if (e) return log.fatal(e);
       p.help();
       p.save();
       Plugin.init();
@@ -96,11 +96,11 @@ cmd.handler = function(argv) {
   }
 
   if (name) plugins = plugins.filter(x => x.name === name);
-  if (plugins.length === 0) return log.error('Plugin not found!');
+  if (plugins.length === 0) return log.fatal('Plugin not found!');
 
   const p = plugins[0];
   if (p.missing && (argv.enable || argv.disable))
-    return log.error('Plugin missing, install it first');
+    return log.fatal('Plugin missing, install it first');
 
   if (argv.enable) {
     p.enabled = true;

lib/commands/submit.js

@@ -44,7 +44,7 @@ function printLine() {
 cmd.handler = function(argv) {
   session.argv = argv;
   if (!file.exist(argv.filename))
-    return log.error('File ' + argv.filename + ' not exist!');
+    return log.fatal('File ' + argv.filename + ' not exist!');
 
   const meta = file.meta(argv.filename);
 

lib/commands/test.js

@@ -54,7 +54,7 @@ function printResult(actual, expect, k) {
 
 function runTest(argv) {
   if (!file.exist(argv.filename))
-    return log.error('File ' + argv.filename + ' not exist!');
+    return log.fatal('File ' + argv.filename + ' not exist!');
 
   const meta = file.meta(argv.filename);
 

lib/log.js

@@ -25,7 +25,16 @@ log.isEnabled = function(name) {
 };
 
 log.fail = function(e) {
-  log.error(sprintf('%s [%d]', (e.msg || e), (e.statusCode || 0)));
+  let msg = sprintf('%s', (e.msg || e));
+  if (e.statusCode) {
+    msg += sprintf(' [code=%d]', e.statusCode);
+  }
+  log.error(msg);
+};
+
+log.fatal = function(e) {
+  log.error(e);
+  process.exit(1);
 };
 
 log.printf = function() {

test/test_log.js

@@ -93,10 +93,10 @@ describe('log', function() {
 
     it('should ok with log.fail', function() {
       log.fail({msg: 'some error', statusCode: 500});
-      assert.equal(expected, chalk.red('[ERROR] some error [500]'));
+      assert.equal(expected, chalk.red('[ERROR] some error [code=500]'));
 
       log.fail('some error');
-      assert.equal(expected, chalk.red('[ERROR] some error [0]'));
+      assert.equal(expected, chalk.red('[ERROR] some error'));
     });
   }); // #levels