From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo
---
server/lib/classes/cron.d/200-logfiles.inc.php | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php
index addbf21..98dd662 100644
--- a/server/lib/classes/cron.d/200-logfiles.inc.php
+++ b/server/lib/classes/cron.d/200-logfiles.inc.php
@@ -60,16 +60,16 @@
// Manage and compress web logfiles and create traffic statistics
//######################################################################################################
- $sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain') AND server_id = ".$conf['server_id'];
- $records = $app->db->queryAllRecords($sql);
+ $sql = "SELECT domain_id, domain, type, document_root, web_folder, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') AND server_id = ?";
+ $records = $app->db->queryAllRecords($sql, $conf['server_id']);
foreach($records as $rec) {
//* create traffic statistics based on yesterdays access log file
$yesterday = date('Ymd', time() - 86400);
$log_folder = 'log';
- if($rec['type'] == 'vhostsubdomain') {
- $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($rec['parent_domain_id']));
+ if($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') {
+ $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = ?', $rec['parent_domain_id']);
$subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']);
if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id'];
$log_folder .= '/' . $subdomain_host;
@@ -89,16 +89,14 @@
//* Insert / update traffic in master database
$traffic_date = date('Y-m-d', time() - 86400);
- $tmp = $app->dbmaster->queryOneRecord("select hostname from web_traffic where hostname='".$rec['domain']."' and traffic_date='".$traffic_date."'");
+ $tmp = $app->dbmaster->queryOneRecord("select hostname from web_traffic where hostname=? and traffic_date=?", $rec['domain'], $traffic_date);
if(is_array($tmp) && count($tmp) > 0) {
- $sql = "update web_traffic set traffic_bytes=traffic_bytes+"
- . $total_bytes
- . " where hostname='" . $rec['domain']
- . "' and traffic_date='" . $traffic_date . "'";
+ $sql = "UPDATE web_traffic SET traffic_bytes=traffic_bytes + ? WHERE hostname = ? AND traffic_date = ?";
+ $app->dbmaster->query($sql, $total_bytes, $rec['domain'], $traffic_date);
} else {
- $sql = "insert into web_traffic (hostname, traffic_date, traffic_bytes) values ('".$rec['domain']."', '".$traffic_date."', '".$total_bytes."')";
+ $sql = "INSERT INTO web_traffic (hostname, traffic_date, traffic_bytes) VALUES (?, ?, ?)";
+ $app->dbmaster->query($sql, $rec['domain'], $traffic_date, $total_bytes);
}
- $app->dbmaster->query($sql);
fclose($handle);
}
@@ -111,6 +109,30 @@
// Compress yesterdays logfile
exec("gzip -c $logfile > $logfile.gz");
unlink($logfile);
+ }
+
+ $cron_logfiles = array('cron.log', 'cron_error.log', 'cron_wget.log');
+ foreach($cron_logfiles as $cron_logfile) {
+ $cron_logfile = escapeshellcmd($rec['document_root'].'/' . $log_folder . '/' . $cron_logfile);
+
+ // rename older files (move up by one)
+ $num = 7;
+ while($num >= 1 && is_file($cron_logfile . '.' . $num . '.gz')) {
+ rename($cron_logfile . '.' . $num . '.gz', $cron_logfile . '.' . ($num + 1) . '.gz');
+ $num--;
+ }
+
+ // compress current logfile
+ if(is_file($cron_logfile)) {
+ exec("gzip -c $cron_logfile > $cron_logfile.1.gz");
+ exec("cat /dev/null > $cron_logfile");
+ }
+ // remove older logs
+ $num = 7;
+ while(is_file($cron_logfile . '.' . $num . '.gz')) {
+ @unlink($cron_logfile . '.' . $num . '.gz');
+ $num++;
+ }
}
// rotate and compress the error.log when it exceeds a size of 10 MB
@@ -173,8 +195,8 @@
// Cleanup website tmp directories
//######################################################################################################
- $sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf['server_id'];
- $records = $app->db->queryAllRecords($sql);
+ $sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ?";
+ $records = $app->db->queryAllRecords($sql, $conf['server_id']);
$app->uses('system');
if(is_array($records)) {
foreach($records as $rec){
@@ -201,8 +223,8 @@
* if they are NOT ok, the server will try to process them in 1 minute and so the
* error appears again after 1 minute. So it is no problem to delete the old one!
*/
- $sql = "DELETE FROM sys_log WHERE tstamp < " . $tstamp . " AND server_id != 0";
- $app->dbmaster->query($sql);
+ $sql = "DELETE FROM sys_log WHERE tstamp < ? AND server_id != 0";
+ $app->dbmaster->query($sql, $tstamp);
/*
* Delete all remote-actions "done" and older than 7 days
@@ -212,11 +234,8 @@
$sql = "SELECT max(action_id) FROM sys_remoteaction";
$res = $app->dbmaster->queryOneRecord($sql);
$maxId = $res['max(action_id)'];
- $sql = "DELETE FROM sys_remoteaction " .
- "WHERE tstamp < " . $tstamp . " " .
- " AND action_state = 'ok' " .
- " AND action_id <" . intval($maxId);
- $app->dbmaster->query($sql);
+ $sql = "DELETE FROM sys_remoteaction WHERE tstamp < ? AND action_state = 'ok' AND action_id < ?";
+ $app->dbmaster->query($sql, $tstamp, $maxId);
/*
* The sys_datalog is more difficult.
@@ -246,14 +265,10 @@
foreach($records as $server) {
$tmp_server_id = intval($server['server_id']);
if($tmp_server_id > 0) {
- $sql = "DELETE FROM sys_datalog " .
- "WHERE tstamp < " . $tstamp .
- " AND server_id = " . intval($server['server_id']) .
- " AND datalog_id < " . intval($server['updated']) .
- " AND datalog_id < " . intval($maxId);
+ $sql = "DELETE FROM sys_datalog WHERE tstamp < ? AND server_id = ? AND datalog_id < ? AND datalog_id < ?";
+ // echo $sql . "\n";
+ $app->dbmaster->query($sql, $tstamp, $server['server_id'], $server['updated'], $maxId);
}
- // echo $sql . "\n";
- $app->dbmaster->query($sql);
}
}
--
Gitblit v1.9.1