From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
server/mods-available/remoteaction_core_module.inc.php | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index d9af3a7..5ee3fc6 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh, Oliver Vogel www.muv.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -35,7 +35,7 @@
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
- return true;
+ return false;
}
/*
@@ -45,7 +45,8 @@
/*
* Check for actions to execute
*/
- $this->_execActions();
+ //* This module has been replaced by the new action framework.
+ // $this->_execActions();
}
/*
@@ -95,7 +96,7 @@
* stop a service, a admin stopped some days before! To avoid this, we ignore
* the status (it is only for the interface to show) and use our own maxid
*/
- include_once (dirname(__FILE__) . "/../lib/remote_action.inc.php");
+ include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
/*
* Get all actions this server should execute
@@ -119,12 +120,14 @@
* we stop executing the actions not to waste more time */
return;
}
+
if ($action['action_type'] == 'ispc_update') {
/* do the update */
- $this->_doIspCUpdate($action);
+ // Update function has been removed
+ // $this->_doIspCUpdate($action);
/* this action takes so much time,
* we stop executing the actions not to waste more time */
- return;
+ $this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_start_vm') {
$veid = intval($action['action_param']);
@@ -243,4 +246,4 @@
//$this->_actionDone($action['action_id'], 'ok');
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1