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 --- interface/lib/plugins/vm_openvz_plugin.inc.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php index a926c0a..b1ce8e6 100644 --- a/interface/lib/plugins/vm_openvz_plugin.inc.php +++ b/interface/lib/plugins/vm_openvz_plugin.inc.php @@ -140,13 +140,14 @@ private function makeOpenVZConfig() { global $app, $conf; - $vm = $app->tform->getDataRecord($this->id); + $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id); $vm_template = $app->db->queryOneRecord("SELECT * FROM openvz_template WHERE template_id = ".$vm['template_id']); $burst_ram = $vm['ram_burst']*256; $guar_ram = $vm['ram']*256; + $app->load('tpl'); $tpl = new tpl(); - $tpl->newTemplate('templates/openvz.conf.tpl'); + $tpl->newTemplate('../vm/templates/openvz.conf.tpl'); $onboot = ($vm['start_boot'] == 'y')?'yes':'no'; $tpl->setVar('onboot',$onboot); @@ -205,7 +206,7 @@ private function createDNS() { global $app, $conf; - $vm = $app->tform->getDataRecord($this->id); + $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id); if($vm['create_dns'] != 'y') return; -- Gitblit v1.9.1