maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Reverting the multiserver-stuff, we'll do this inside the branch

Browse Source
This commit is contained in:
Florian Aders (EleRas)
2010-10-23 10:20:23 +00:00
parent 99696ff6cb
commit ad31b07a04
32 changed files with 169 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/jobs/cron_tasks.php
View File

@@ -25,10 +25,6 @@ require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.10.apache
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.15.apache_fcgid.php'));
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.20.lighttpd.php'));
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.25.lighttpd_fcgid.php'));
// only include if multiserver is enabled
if($settings['multiserver']['enabled']) {
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.multiserver.client_deploy.php'));
}
/**
* LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS
@@ -36,14 +32,7 @@ if($settings['multiserver']['enabled']) {
fwrite($debugHandler, ' cron_tasks: Searching for tasks to do' . "\n");
$cronlog->logAction(CRON_ACTION, LOG_INFO, "Searching for tasks to do");
$server_id = getServerId();
$result_tasks = $db->query("SELECT
`id`, `type`, `data`
FROM
`" . TABLE_PANEL_TASKS . "`
WHERE
`sid` = '".$server_id."'
ORDER BY `id` ASC");
$result_tasks = $db->query("SELECT `id`, `type`, `data` FROM `" . TABLE_PANEL_TASKS . "` ORDER BY `id` ASC");
$resultIDs = array();
while($row = $db->fetch_array($result_tasks))
@@ -379,36 +368,6 @@ while($row = $db->fetch_array($result_tasks))
}
}
}
/**
* TYPE=9 -> deploy a Froxlor multiserver client to its destination
*/
elseif ($row['type'] == '9')
{
fwrite($debugHandler, ' cron_tasks: Task9 started - deploy a Froxlor multiserver client' . "\n");
$cronlog->logAction(CRON_ACTION, LOG_INFO, 'Task9 started - deploy a Froxlor multiserver client');
if(is_array($row['data']))
{
if(isset($row['data']['serverid']))
{
/*
* get froxlor-client-object
*/
$client = froxlorclient::getInstance(null, $db, (int)$row['data']['serverid']);
/*
* create new deployer-object
*/
$deployer = new client_deployer($client);
/*
* deploy
*
* @TODO handle Exceptions
*/
$deployer->Deploy();
}
}
}
}
if($db->num_rows($result_tasks) != 0)