From 294d06ce489be3944f9ffbf0d66c58e276fe3fdc Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 08 Mar 2009 12:29:36 -0400
Subject: [PATCH] css form length fix
---
server/server.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/server.php b/server/server.php
index 1cbdec7..7837ca8 100644
--- a/server/server.php
+++ b/server/server.php
@@ -49,13 +49,14 @@
}
*/
-/*
+
// Check if another process is running
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
clearstatcache();
- for($i=0;$i<120;$i++){ // Wait max. 120 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")){
- sleep(1);
+ $app->log("There is already a lockfile set. Waiting another 10 seconds...", LOGLEVEL_DEBUG);
+ sleep(10);
clearstatcache();
}
}
@@ -64,14 +65,13 @@
// Set Lockfile
@touch($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
-*/
+
if($app->dbmaster->connect()) {
// get the dalaog_id of the last performed record
- $tmp_rec = $app->dbmaster->queryOneRecord("SELECT updated FROM server WHERE server_id = ".$conf["server_id"]);
- $conf['last_datalog_id'] = (int)$tmp_rec['updated'];
- unset($tmp_rec);
+ $server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]);
+ $conf['last_datalog_id'] = (int)$server_db_record['updated'];
// Check if there is anything to update
$tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0)");
@@ -116,11 +116,11 @@
$app->log("Unable to connect to master server.",LOGLEVEL_ERROR);
}
-/*
+
// Remove lock
@unlink($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
$app->log("Remove Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock",LOGLEVEL_DEBUG);
-*/
+
die("finished.\n");
?>
\ No newline at end of file
--
Gitblit v1.9.1