[refactor] Make forever.checkProcess synchronous

indexzero · Oct 22, 2011 · c17d004 · c17d004
1 parent f820056
commit c17d004
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/lib/forever.js b/lib/forever.js
@@ -740,13 +740,9 @@ forever.cleanUp = function (cleanLogs, allowManager) {
     }
 
     function checkProcess(proc, next) {
-      forever.checkProcess(proc.pid, function (child) {
+      proc.child = forever.checkProcess(proc.pid);
-        proc.child = child;
+      proc.manager = forever.checkProcess(proc.foreverPid);
-        forever.checkProcess(proc.foreverPid, function (manager) {
+      cleanProcess(proc, next);
-          proc.manager = manager;
-          cleanProcess(proc, next);
-        });
-      });
     }
 
     if (processes && processes.length > 0) {
@@ -848,9 +844,9 @@ forever.pidFilePath = function (pidFile) {
 // #### @callback {function} Continuation to pass control backto.
 // Utility function to check to see if a pid is running
 //
-forever.checkProcess = function (pid, callback) {
+forever.checkProcess = function (pid) {
   if (!pid) {
-    return callback(false);
+    return false;
   }
 
   try {
@@ -860,10 +856,10 @@ forever.checkProcess = function (pid, callback) {
     // only checks if sending a singal to a given process is possible.
     //
     process.kill(pid, 0);
-    callback(true);
+    return true;
   }
   catch (err) {
-    callback(false);
+    return false;
   }
 };