From 8c4aa39481bbfde2b403f4787c85c057e84f2e12 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Jul 2009 09:01:13 -0400
Subject: [PATCH] Merged revisions 1216 - 1279 from trunk
---
server/server.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/server.php b/server/server.php
index 3646f81..93e4c21 100644
--- a/server/server.php
+++ b/server/server.php
@@ -54,8 +54,13 @@
// Check if another process is running
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
clearstatcache();
- for($i=0;$i<1200;$i++){ // Wait max. 1200 sec, then proceed
+ for($i=0;$i<120;$i++){ // Wait max. 1200 sec, then proceed
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);
+ 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;
+ }
$app->log("There is already a lockfile set. Waiting another 10 seconds...", LOGLEVEL_DEBUG);
sleep(10);
clearstatcache();
--
Gitblit v1.9.1