From 07cdaafc715bf55126959f93bd79b51b3cadddce Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Sun, 30 Nov 2008 16:38:29 -0500
Subject: [PATCH]
---
server/server.php | 97 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/server/server.php b/server/server.php
index d4b0565..f0eabfc 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,
@@ -36,8 +36,9 @@
// 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,7 +47,9 @@
$app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf["server_id"]);
$app->log("Begin update.");
}
+*/
+/*
// Check if another process is running
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
clearstatcache();
@@ -60,56 +63,54 @@
// 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"]));
+// Check if there is anything to update
+$tmp_rec = $app->db->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE server_id = ".$conf["server_id"]);
+$tmp_num_records = $tmp_rec["number"];
+unset($tmp_rec);
-// 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($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('ini_parser,modules,plugins,file,services');
+ // Get server configuration
+ $conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
+ // 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('ini_parser,modules,plugins,file,services');
+ // Get server configuration
+ $conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
+ // 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');
}
-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();
-}
-
-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();
-}
-
+/*
// Remove lock
@unlink($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
-$app->log("Remove Lock: ".$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