From 80e7b0d7d17b0e9581fa56be484b8772d82261de Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 18 Nov 2009 11:19:42 -0500
Subject: [PATCH] Added code to delete old remote sessions.
---
server/server.php | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/server/server.php b/server/server.php
index 1cbdec7..93e4c21 100644
--- a/server/server.php
+++ b/server/server.php
@@ -32,6 +32,7 @@
require("lib/app.inc.php");
set_time_limit(0);
+ini_set('error_reporting','E_ALL & ~E_NOTICE');
// make sure server_id is always an int
$conf["server_id"] = intval($conf["server_id"]);
@@ -49,13 +50,19 @@
}
*/
-/*
+
// 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);
+ 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();
}
}
@@ -64,14 +71,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()) {
+
+if($app->db->connect() && $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)");
@@ -113,14 +119,17 @@
$app->plugins->loadPlugins('core');
}
} else {
- $app->log("Unable to connect to master server.",LOGLEVEL_ERROR);
+ if(!$app->db->connect()) {
+ $app->log("Unable to connect to local server.".$app->db->errorMessage,LOGLEVEL_WARN);
+ } else {
+ $app->log("Unable to connect to master server.".$app->dbmaster->errorMessage,LOGLEVEL_WARN);
+ }
}
-/*
// 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