From 0d0cd9b8ad552fd83197190a9e2fab7a379446a7 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Thu, 30 Oct 2008 16:01:05 -0400
Subject: [PATCH] Added support for core-modules. Core modules are modules without DB-trigger Added new table monitor_data for the core-module monitor.
---
server/server.php | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/server/server.php b/server/server.php
index b87ea45..f0eabfc 100644
--- a/server/server.php
+++ b/server/server.php
@@ -72,42 +72,38 @@
unset($tmp_rec);
if($tmp_num_records > 0) {
-
- $app->log("Found $tmp_num_records changes, starting update process.",LOGLEVEL_DEBUG);
-
+ /*
+ 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();
-
- /*
- 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
- */
+ // 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
- */
+ // Restart services that need to be restarted after configuration
$app->services->processDelayedActions();
-
-
} else {
- $app->log('No Updated records found.',LOGLEVEL_DEBUG);
+ /*
+ 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');
}
/*
--
Gitblit v1.9.1