From c2f53e76fde1ab534e67a9227d4f0adcde05dfa4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:05:37 -0400
Subject: [PATCH] Fix in maildrop plugin.
---
server/server.php | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 deletions(-)
diff --git a/server/server.php b/server/server.php
index d4b0565..61a809f 100644
--- a/server/server.php
+++ b/server/server.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2006, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -32,12 +32,14 @@
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"]);
+/*
// Get server record, if updates where available for this server
-$server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf["server_id"])
+$server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf["server_id"]);
if($server_db_record == false) {
$app->log("Nothing to update for server_id ".$conf["server_id"]);
die();
@@ -46,13 +48,37 @@
$app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf["server_id"]);
$app->log("Begin update.");
}
+*/
+
+//* Load the server configuration
+if($app->dbmaster->connect()) {
+ // get the dalaog_id of the last performed record
+ $server_db_record = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = ".$conf["server_id"]);
+ $conf['last_datalog_id'] = (int)$server_db_record['updated'];
+ $conf["mirror_server_id"] = (int)$server_db_record['mirror_server_id'];
+ // Load the ini_parser
+ $app->uses('ini_parser');
+ // Get server configuration
+ $conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
+ // Set the loglevel
+ $conf["log_priority"] = intval($conf["serverconfig"]["server"]["loglevel"]);
+
+ unset($server_db_record);
+}
+
// 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();
}
}
@@ -60,56 +86,63 @@
// Set Lockfile
@touch($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
-$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock");
+$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
-// Get server configuration
-$this->uses('ini_parser');
-$conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
-// Run the configuration modules
-if($server_db_record["mail_server"] == 1) {
- $app->load('mod_mail_base');
- $mail_module_name = 'mod_mail_'.$conf["serverconfig"]["mail"]["module"];
- $app->uses($mail_module_name);
- $app->$mail_module_name->write_config();
-}
+if($app->db->connect() && $app->dbmaster->connect()) {
-if($server_db_record["web_server"] == 1) {
- $app->load('mod_web_base');
- $web_module_name = 'mod_web_'.$conf["serverconfig"]["web"]["module"];
- $app->uses($web_module_name);
- $app->$web_module_name->write_config();
-}
+ // 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)");
+ } 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_num_records = $tmp_rec["number"];
+ unset($tmp_rec);
-if($server_db_record["dns_server"] == 1) {
- $app->load('mod_dns_base');
- $dns_module_name = 'mod_dns_'.$conf["serverconfig"]["dns"]["module"];
- $app->uses($dns_module_name);
- $app->$dns_module_name->write_config();
-}
-
-if($server_db_record["file_server"] == 1) {
- $app->load('mod_file_base');
- $file_module_name = 'mod_file_'.$conf["serverconfig"]["file"]["module"];
- $app->uses($file_module_name);
- $app->$file_module_name->write_config();
-}
-
-if($server_db_record["db_server"] == 1) {
- $app->load('mod_db_base');
- $db_module_name = 'mod_db_'.$conf["serverconfig"]["db"]["module"];
- $app->uses($db_module_name);
- $app->$db_module_name->write_config();
-}
-
-if($server_db_record["vserver_server"] == 1) {
- $app->load('mod_vserver_base');
- $vserver_module_name = 'mod_vserver_'.$conf["serverconfig"]["vserver"]["module"];
- $app->uses($vserver_module_name);
- $app->$vserver_module_name->write_config();
+ if($tmp_num_records > 0) {
+ /*
+ There is something to do, triggert by the database -> do it!
+ */
+ // Write the Log
+ $app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);
+ // Load required base-classes
+ $app->uses('modules,plugins,file,services');
+ // Load the modules that are im the mods-enabled folder
+ $app->modules->loadModules('all');
+ // Load the plugins that are in the plugins-enabled folder
+ $app->plugins->loadPlugins('all');
+ // Go trough the sys_datalog table and call the processing functions
+ // in the modules that are hooked on to the table actions
+ $app->modules->processDatalog();
+ // Restart services that need to be restarted after configuration
+ $app->services->processDelayedActions();
+ } else {
+ /*
+ There is no trigger inside the database -> load only the core, maybe they have to do something
+ */
+ // Write the log
+ $app->log('No Updated records found, starting only the core.', LOGLEVEL_DEBUG);
+ // Load required base-classes
+ $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');
+ }
+} else {
+ 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");
-?>
\ No newline at end of file
+$app->log("Remove Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock",LOGLEVEL_DEBUG);
+
+
+die("finished.\n");
+?>
--
Gitblit v1.9.1