From 1ba01fe1bd9257c154ccf6a810ebb0fc7b29dfd4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 01 Mar 2009 09:34:36 -0500
Subject: [PATCH] added quota configuration to debian lenny installation guide.
---
server/server.php | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/server/server.php b/server/server.php
index 89341eb..1cbdec7 100644
--- a/server/server.php
+++ b/server/server.php
@@ -66,41 +66,54 @@
$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
*/
-// 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);
+if($app->dbmaster->connect()) {
-if($tmp_num_records > 0) {
-
- $app->log("Found $tmp_num_records changes, starting update process.",LOGLEVEL_DEBUG);
-
- // Load required base-classes
- $app->uses('ini_parser,modules,plugins');
-
-
- // Get server configuration
- $conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
+ // 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);
- /*
- Load the modules that are im the mods-enabled folder
- */
+ // 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)");
+ $tmp_num_records = $tmp_rec["number"];
+ unset($tmp_rec);
- $app->modules->loadModules();
-
- /*
- Load the plugins that are in the plugins-enabled folder
- */
-
- $app->plugins->loadPlugins();
-
- /*
- 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();
+ 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');
+ }
} else {
- $app->log('Nothing to Update.',LOGLEVEL_DEBUG);
+ $app->log("Unable to connect to master server.",LOGLEVEL_ERROR);
}
/*
--
Gitblit v1.9.1