From b2b44b5e7cd71dea76f0fce66d69741df5d36145 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Jul 2009 06:21:24 -0400
Subject: [PATCH] Updated version number to 3.0.1.4 and changed sort order to domain name in the mailbox, alias and forward forms.
---
server/server.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/server.php b/server/server.php
index 29c07a3..93e4c21 100644
--- a/server/server.php
+++ b/server/server.php
@@ -56,6 +56,11 @@
clearstatcache();
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();
@@ -127,4 +132,4 @@
die("finished.\n");
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1