From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/server.php | 99 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/server/server.php b/server/server.php
index e669c6e..689cb17 100644
--- a/server/server.php
+++ b/server/server.php
@@ -28,8 +28,29 @@
*/
define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
-require(SCRIPT_PATH."/lib/config.inc.php");
-require(SCRIPT_PATH."/lib/app.inc.php");
+require SCRIPT_PATH."/lib/config.inc.php";
+
+// Check whether another instance of this script is already running
+if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock')) {
+ clearstatcache();
+ $pid = trim(file_get_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock'));
+ if(preg_match('/^[0-9]+$/', $pid)) {
+ if(file_exists('/proc/' . $pid)) {
+ print @date('d.m.Y-H:i').' - WARNING - There is already an instance of server.php running with pid ' . $pid . '.' . "\n";
+ exit;
+ }
+ }
+ print @date('d.m.Y-H:i').' - WARNING - There is already a lockfile set, but no process running with this pid (' . $pid . '). Continuing.' . "\n";
+}
+
+// Set Lockfile
+@file_put_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', getmypid());
+
+if($conf['log_priority'] <= LOGLEVEL_DEBUG) print 'Set Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock' . "\n";
+
+require SCRIPT_PATH."/lib/app.inc.php";
+
+$app->setCaller('server');
set_time_limit(0);
ini_set('error_reporting', E_ALL & ~E_NOTICE);
@@ -41,17 +62,17 @@
* Try to Load the server configuration from the master-db
*/
if ($app->dbmaster->connect_error == NULL) {
- $server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = " . $conf['server_id']);
-
+ $server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = ?", $conf['server_id']);
+
if(!is_array($server_db_record)) die('Unable to load the server configuration from database.');
-
- //* Get the number of the last processed datalog_id, if the id of the local server
+
+ //* Get the number of the last processed datalog_id, if the id of the local server
//* is > then the one of the remote system, then use the local ID as we might not have
//* reached the remote server during the last run then.
- $local_server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE server_id = " . $conf['server_id']);
- $conf['last_datalog_id'] = (int) max($server_db_record['updated'],$local_server_db_record['updated']);
+ $local_server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE server_id = ?", $conf['server_id']);
+ $conf['last_datalog_id'] = (int) max($server_db_record['updated'], $local_server_db_record['updated']);
unset($local_server_db_record);
-
+
$conf['mirror_server_id'] = (int) $server_db_record['mirror_server_id'];
// Load the ini_parser
@@ -63,9 +84,19 @@
// Set the loglevel
$conf['log_priority'] = intval($conf['serverconfig']['server']['loglevel']);
+ // Set level from which admin should be notified by email
+ if(!isset($conf['serverconfig']['server']['admin_notify_events']) || $conf['serverconfig']['server']['admin_notify_events'] == '') $conf['serverconfig']['server']['admin_notify_events'] = 3;
+ $conf['admin_notify_priority'] = intval($conf['serverconfig']['server']['admin_notify_events']);
+
// we do not need this variable anymore
unset($server_db_record);
-
+
+ // retrieve admin email address for notifications
+ $sys_ini = $app->db->queryOneRecord("SELECT * FROM sys_ini WHERE sysini_id = 1");
+ $conf['sys_ini'] = $app->ini_parser->parse_ini_string(stripslashes($sys_ini['config']));
+ $conf['admin_mail'] = $conf['sys_ini']['mail']['admin_mail'];
+ unset($sys_ini);
+
/*
* Save the rescue-config, maybe we need it (because the database is down)
*/
@@ -76,14 +107,14 @@
// protect the file
chmod(dirname(__FILE__) . "/temp/rescue_module_serverconfig.ser.txt", 0600);
-
+
} else {
/*
* The master-db is not available.
* Problem: because we need to start the rescue-module (to rescue the DB if this IS the
* server, the master-db is running at) we have to initialize some config...
*/
-
+
/*
* If there is a temp-file with the data we could get from the database, then we use it
*/
@@ -91,14 +122,14 @@
if (file_exists(dirname(__FILE__) . "/temp/rescue_module_serverconfig.ser.txt")){
$tmp = unserialize(file_get_contents(dirname(__FILE__) . "/temp/rescue_module_serverconfig.ser.txt"));
}
-
+
// maxint at 32 and 64 bit systems
- $conf['last_datalog_id'] = intval('9223372036854775807');
+ $conf['last_datalog_id'] = intval('9223372036854775807');
// no mirror
- $conf['mirror_server_id'] = 0;
+ $conf['mirror_server_id'] = 0;
- // Set the loglevel
+ // Set the loglevel
$conf['log_priority'] = (isset($tmp['serverconfig']['server']['loglevel']))? $tmp['serverconfig']['server']['loglevel'] : LOGLEVEL_ERROR;
/*
* Set the configuration to rescue the database
@@ -113,29 +144,9 @@
unset($tmp);
}
-
-// 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 retry
- if (is_file($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock')) {
- 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;
- }
- $app->log('There is already a lockfile set. Waiting another 10 seconds...', LOGLEVEL_DEBUG);
- sleep(10);
- clearstatcache();
- }
- }
-}
-
-// Set Lockfile
-@touch($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock');
-$app->log('Set Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', LOGLEVEL_DEBUG);
-
/** Do we need to start the core-modules */
+
+
$needStartCore = true;
/*
@@ -145,14 +156,14 @@
// Check if there is anything to update
if ($conf['mirror_server_id'] > 0) {
- $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 = " . $conf['mirror_server_id'] . " OR server_id = 0)");
+ $tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ? AND (server_id = ? OR server_id = ? OR server_id = 0)", $conf['last_datalog_id'], $conf['server_id'], $conf['mirror_server_id']);
} else {
- $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)");
+ $tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ? AND (server_id = ? OR server_id = 0)", $conf['last_datalog_id'], $conf['server_id']);
}
$tmp_num_records = $tmp_rec['number'];
unset($tmp_rec);
-
+
//** Load required base-classes
$app->uses('modules,plugins,file,services,system');
//** Load the modules that are in the mods-enabled folder
@@ -174,7 +185,7 @@
$app->services->processDelayedActions();
//** All modules are already loaded and processed, so there is NO NEED to load the core once again...
$needStartCore = false;
-
+
} else {
if ($app->db->connect->connect_error == NULL) {
$app->log('Unable to connect to local server.' . $app->db->errorMessage, LOGLEVEL_WARN);
@@ -196,8 +207,8 @@
$app->uses('modules,plugins,file,services');
// Load the modules that are im the mods-core folder
$app->modules->loadModules('core');
- // Load the plugins that are in the plugins-core folder
- $app->plugins->loadPlugins('core');
+ // Load the plugins that are in the f folder
+ //$app->plugins->loadPlugins('core');
}
--
Gitblit v1.9.1