Merge pull request #8 from keymetrics/git_timeout

Change timeout to 5 seconds instead of 60 Unitech/pm2#1177
keymetrics · Apr 16, 2015 · 073c9e5 · 073c9e5
2 parents 07638d9 + 24c19bb
commit 073c9e5
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/git.js b/lib/git.js
@@ -4,6 +4,8 @@ var exec = require('child_process').exec;
 
 var git = {};
 
+var TIMEOUT = 5000;
+
 git.parse = function(folder, cb) {
   var myTrim = function(str) {
     if (typeof(str) === 'string')
@@ -12,7 +14,7 @@ git.parse = function(folder, cb) {
   };
 
   var getUrl = function(cb) {
-    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git config --get remote.origin.url", {timeout: 60000},
+    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git config --get remote.origin.url", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -24,7 +26,7 @@ git.parse = function(folder, cb) {
   };
 
   var getMeta = function(data, cb) {
-    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git show --quiet --format=%H%n%aD%n%s%n%B HEAD", {timeout: 60000},
+    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git show --quiet --format=%H%n%aD%n%s%n%B HEAD", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -37,7 +39,7 @@ git.parse = function(folder, cb) {
   };
 
   var getStaged = function(data, cb) {
-    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git status -s", {timeout: 60000},
+    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git status -s", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -47,7 +49,7 @@ git.parse = function(folder, cb) {
   };
 
   var getBranch = function(data, cb) {
-    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git rev-parse --abbrev-ref HEAD", {timeout: 60000},
+    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git rev-parse --abbrev-ref HEAD", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -57,7 +59,7 @@ git.parse = function(folder, cb) {
   };
 
   var getRemote = function(data, cb) {
-    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git remote", {timeout: 60000},
+    exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git remote", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -71,7 +73,7 @@ git.parse = function(folder, cb) {
 
   var getPrevNext = function(data, cb) {
     exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git log "+data.remote+"/"+data.branch+" --pretty=oneline",
-    {timeout: 60000},
+    {timeout: TIMEOUT},
     function(err, stdout, stderr) {
       if(err !== null)
         return cb(err);
@@ -121,7 +123,7 @@ git.isUpdated = function(folder, cb) {
     if (err !== null)
       return cb(err);
     exec("cd '"+folder+"';LC_ALL=en_US.UTF-8 git remote update >> /dev/null 2>&1; git log "+data.remote
-         +"/"+data.branch+" --pretty=oneline -n 1", {timeout: 60000},
+         +"/"+data.branch+" --pretty=oneline -n 1", {timeout: TIMEOUT},
     function(err, stdout, stderr) {
            var res = {};
 
@@ -144,7 +146,7 @@ git.revert = function(args, cb) {
   ret.output = '';
   ret.output += command + '\n';
   ret.success = true;
-  exec(command, {timeout: 60000},
+  exec(command, {timeout: TIMEOUT},
   function(err, stdout, stderr) {
     ret.output += stdout;
     if (err !== null || stderr.substring(0, 6) === 'fatal:')