[minor] Small refactor to make jitsu.setup() async.

nodejitsu · Apr 3, 2011 · f5121b9 · f5121b9
1 parent e971a29
commit f5121b9
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/lib/jitsu.js b/lib/jitsu.js
@@ -74,23 +74,29 @@ jitsu.start = function (command, callback) {
 //
 jitsu.exec = function (command, callback) {
   if (!command) {
-    return winston.error('No command supplied');
-  }
-  else if (!started) {
-    jitsu.setup();
+    winston.error('No command supplied');
+    return jitsu.showError(command, {}, true, true);
   }
 
-  winston.info('Executing command ' + jitsu.commands.parse(command).splice(0, 2).join(' ').magenta);
-  jitsu.commands.run(command, function (err, shallow) {
+  function execCommand (err) {
     if (err) {
-      return jitsu.showError(command, err, shallow);
+      return callback(err);
     }
 
-    //
-    // TODO (indexzero): Something here
-    //
-    callback();
-  });
+    winston.info('Executing command ' + jitsu.commands.parse(command).splice(0, 2).join(' ').magenta);
+    jitsu.commands.run(command, function (err, shallow) {
+      if (err) {
+        return jitsu.showError(command, err, shallow);
+      }
+
+      //
+      // TODO (indexzero): Something here
+      //
+      callback();
+    });
+  }
+
+  return !started ? jitsu.setup(execCommand) : execCommand();
 };
 
 //
@@ -108,6 +114,7 @@ jitsu.setup = function (callback) {
   jitsu.apps = new jitsu.api.Apps(jitsu.config.settings);
   jitsu.snapshots = new jitsu.api.Snapshots(jitsu.config.settings);
   started = true;
+  callback();
 };
 
 //
@@ -152,8 +159,8 @@ jitsu.setupUser = function (callback) {
   });
 };
 
-jitsu.showError = function (command, err, shallow) {
-  if (err.statusCode !== '403') {
+jitsu.showError = function (command, err, shallow, skip) {
+  if (err.statusCode !== '403' && !skip) {
     winston.error('Error running command ' + command.magenta);
 
     if (err.message) {