Merge pull request #391 from nodejitsu/check-version-fix

[merge] Fixes jitsu not reporting new version
nodejitsu · Feb 18, 2013 · aa6fc40 · aa6fc40
2 parents 19ca735 + 0ebdc1a
commit aa6fc40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/jitsu.js b/lib/jitsu.js
@@ -141,16 +141,16 @@ jitsu.start = function (callback) {
     return;
   }
 
-  jitsu.common.checkVersion(function (err) {
+  jitsu.init(function (err) {
     if (err) {
-      return callback();
+      jitsu.welcome();
+      callback(err);
+      return jitsu.showError(jitsu.argv._.join(' '), err);
     }
-    
-    jitsu.init(function (err) {
+
+    jitsu.common.checkVersion(function (err) {
       if (err) {
-        jitsu.welcome();
-        callback(err);
-        return jitsu.showError(jitsu.argv._.join(' '), err);
+        return callback();
       }
 
       //

diff --git a/lib/jitsu/common/index.js b/lib/jitsu/common/index.js
@@ -173,7 +173,7 @@ common.checkVersion = function (callback) {
   //
   request({
     uri: 'http://registry.npmjs.org/jitsu/latest',
-    timeout: 400
+    timeout: 1000
   }, function (err, res, body) {
     if (!responded) {
       responded = true;