From 9b82d2915ca6b4b3f1112b5b3167eed1a888c56a Mon Sep 17 00:00:00 2001
From: jwarnier <jwarnier@ispconfig3>
Date: Tue, 17 Aug 2010 22:11:24 +0000
Subject: [PATCH] Slightly improve process matching with a well-known UNIX
 shell trick.

---
 server/server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/server.php b/server/server.php
index 61a809f8a..98a72c296 100644
--- a/server/server.php
+++ b/server/server.php
@@ -67,12 +67,12 @@ if($app->dbmaster->connect()) {
 }
 
 
-// Check if another process is running
+// Check whether another instance of this script is already running
 if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
   clearstatcache();
-  for($i=0;$i<120;$i++){ // Wait max. 1200 sec, then proceed
+  for($i=0;$i<120;$i++){ // Wait max. 1200 sec, then retry
     if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
-      exec("ps aux | grep '/usr/local/ispconfig/server/server.php' | grep -v 'grep' | wc -l", $check);
+      exec("ps aux | grep '/usr/local/ispconfig/server/[s]erver.php' | wc -l", $check);
       if(intval($check[0]) > 1) { // 1 because this is 2nd instance!
           $app->log("There is already an instance of server.php running. Exiting.", LOGLEVEL_DEBUG);
           exit;
-- 
GitLab